Merge pull request jglobus#73 from bpalak/master

Merging Bartek's changes to trunk.
abinpaul · Aug 27, 2013 · 3e04691 · 3e04691
2 parents 0f548f5 + 9f61d2b
commit 3e04691
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java b/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java
@@ -17,7 +17,7 @@
 
 import org.apache.commons.httpclient.HostConfiguration;
 
-public class ExtendedHostConfiguration extends HostConfiguration {
+public class ExtendedHostConfiguration extends HostConfiguration  implements Cloneable{
 
     private String [] paramList;
 

diff --git a/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java b/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java
@@ -67,9 +67,6 @@ public String getCodeExplanation(int code) {
 	else return "";
     }
 
-
-    protected int code = UNSPECIFIED;
-
     public ClientException(int code, String message) {
 	super(code, message);
     }

diff --git a/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java b/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java
@@ -39,8 +39,6 @@ public String getCodeExplanation(int code) {
     }
 
 
-    protected int code = UNSPECIFIED;
-
     //this message is not just explanation of the code.
     //it is a custom message informing of particular 
     //conditions of the error.

diff --git a/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java b/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java
@@ -40,8 +40,6 @@ public String getCodeExplanation(int code) {
     }
 
 
-    protected int code = UNSPECIFIED;
-
     //this message is not just explanation of the code.
     //it is a custom message informing of particular 
     //conditions of the error.

diff --git a/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java b/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java
@@ -55,8 +55,6 @@ public String getCodeExplanation(int code) {
     }
 
 
-    protected int code = UNSPECIFIED;
-
     //this message is not just explanation of the code.
     //it is a custom message informing of particular 
     //conditions of the error.

diff --git a/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java b/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java
@@ -118,9 +118,10 @@ public synchronized void connect()
         ((GssSocket)socket).setAuthorization(authorization);
     }
 
-    public void disconnect() {
+    public synchronized void disconnect() {
         if (socket != null) {
             try { socket.close(); } catch (Exception e) {}
+            socket = null;
         }
     }
 

diff --git a/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java b/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java
@@ -247,7 +247,7 @@ public synchronized void reload(String locations) {
                 Iterator iter = caCerts.iterator();
                 while (iter.hasNext()) {
                     X509Certificate cert = (X509Certificate) iter.next();
-                    if (!newCertSubjectDNMap.containsKey(cert.getSubjectDN().toString()));
+                    if (!newCertSubjectDNMap.containsKey(cert.getSubjectDN().toString()))
                         newCertSubjectDNMap.put(cert.getSubjectDN().toString(), cert);
                 }
             } catch (Exception e) {

diff --git a/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java b/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java
@@ -666,9 +666,11 @@ public void loadKey(String arg) {
 
     } catch(IOException e) {
         System.err.println("Error: Failed to load key: " + arg);
+        System.err.println("Error: " + e.getMessage());
         System.exit(-1);
     } catch(GeneralSecurityException e) {
         System.err.println("Error: Wrong pass phrase");
+        System.err.println("Error: " + e.getMessage());
         if (debug) {
         e.printStackTrace();
         }