Changeset 854

Timestamp:

May 3, 2013, 3:35:11 PM (12 years ago)

Author:

alloc

Message:

SVNAccess:

• Refs #3: Little fix for proxy support

File:

• java/SVNAccess/src/net/oni2/svnaccess/SVN.java (modified) (7 diffs)

java/SVNAccess/src/net/oni2/svnaccess/SVN.java

@@ -45 +45 @@
         private void setProxy(BasicAuthenticationManager authMan) {
                 ProxySettings prox = ProxySettings.getInstance();
-                if (prox.validate()) {
+                if (prox.validate() && prox.isUseProxy()) {
                         authMan.setProxy(prox.getHostOrIp(), prox.getPort(), null, null);
                 }
@@ -126 +126 @@
          * @param wcDir
          *            Local working copy path to compare against
-         * @return -1: No local working copy yet<br>
+         * @return -2: No connection to remote repos<br>
+         *         -1: No local working copy yet<br>
          *         0: Revisions are equal<br>
          *         1: SVN contains newer revisions<br>
@@ -138 +139 @@
                 if (wcDir.exists()) {
                         int localRev = pathIsWCof(repos, wcDir);
-                        if (localRev < 0)
-                                throw new Exception(
-                                                "Destination path exists but is not a Working Copy of the SVN");
+                        if (localRev < 0) {
+                                if (wcDir.listFiles().length > 0) {
+                                        throw new Exception(
+                                                        "Destination path exists but is not a Working Copy of the SVN");
+                                } else {
+                                        wcDir.delete();
+                                        return -1;
+                                }
+                        }
                         int remoteRev = getRemoteHeadRevision(repos);
                         if (remoteRev > localRev)
                                 return 1;
                         else {
-                                if (getMissingFiles(wcDir))
-                                        return 2;
-                                else
-                                        return 0;
+                                if (remoteRev < 0) {
+                                        return -2;
+                                } else {
+                                        if (getMissingFiles(wcDir))
+                                                return 2;
+                                        else
+                                                return 0;
+                                }
                         }
                 } else {
@@ -201 +212 @@
                                 err.println("Error while getting information of working copy for the location '"
                                                 + reposUrl + "': " + e.getMessage());
+                                e.printStackTrace();
                         }
                 }
@@ -240 +252 @@
                         err.println("Error while updating the working copy for the location '"
                                         + reposUrl + "': " + e.getMessage());
+                        e.printStackTrace();
                 }
                 return false;
@@ -254 +267 @@
                         err.println("Error while getting the list of files of the location '"
                                         + reposUrl + "': " + e.getMessage());
+                        e.printStackTrace();
                 }
                 return list;
@@ -274 +288 @@
                         err.println("Error while checking out a working copy for the location '"
                                         + reposUrl + "': " + e.getMessage());
+                        e.printStackTrace();
                 }
                 return result;