Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1469 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/client

subclipse
Discussion topic

Back to topic list

svn commit: r1469 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/client

Author markphip
Full name Mark Phippard
Date 2005-07-20 09:07:42 PDT
Message Author: markphip
Date: Wed Jul 20 09:07:41 2005
New Revision: 1469

Modified:
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/StatusAndIn​foCommand.java
Log:
StatusAndInfoCommand.java

Added try/catch on attempt to retrieve SVNInfo. The problem case is with
svn:externals. We do not build a correct URL so the svn info call fails.
The better fix would be to build the correct URL and let exceptions be thrown
as they were prior to this change.

That being said, this change seems to fix the problem completely and the
extra call to svn info only happens on new incoming files and is not
absolutely essential for things to work.


Issue #: 343


Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/StatusAndIn​foCommand.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/client​/StatusAndInfoComman​d.java?view=diff​&rev=1469&p1=tru​nk/subclipse/core/sr​c/org/tigris/subvers​ion/subclipse/core/c​lient/StatusAndInfoC​ommand.java&r1=1​468&p2=trunk/sub​clipse/core/src/org/​tigris/subversion/su​bclipse/core/client/​StatusAndInfoCommand​.java&r2=1469
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/StatusAndIn​foCommand.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/client/StatusAndIn​foCommand.java Wed Jul 20 09:07:41 2005
@@ -92,11 +92,16 @@
      * @param statuse - InformedStatuses which nodeKinds we want to get and set
      * @throws SVNClientException
      */
- private void fetchNodeKind(ISVNClientAdapter client, InformedStatus status) throws SVNClientException
+ private void fetchNodeKind(ISVNClientAdapter client, InformedStatus status)
     {
         SVNUrl url = SVNUrlUtils.getUrlFr​omLocalFileName(stat​us.getPath(), svnResource.getUrl(), svnResource.getFile(​).getAbsolutePath())​;
- ISVNInfo info = client.getInfo(url);
- if (info != null)
+ ISVNInfo info;
+ try {
+ info = client.getInfo(url);
+ } catch (SVNClientException e) {
+ info = null;
+ }
+ if (info != null)
         {
             status.setInformedKi​nd(info.getNodeKind(​));
         }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1469 - trunk/subclipse/core/src/org/tigris/subversion/subclipse/core/client markphip Mark Phippard 2005-07-20 09:07:42 PDT
Messages per page: