db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1485264 - in /db/derby/code/branches/10.10: ./ java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Wed, 22 May 2013 16:05:00 GMT
Author: kmarsden
Date: Wed May 22 16:04:59 2013
New Revision: 1485264

URL: http://svn.apache.org/r1485264
Log:
DERBY-5610 ServerPropertiesTest prints .java.net.SocketException: Connection reset to console
but test passes 

merge from trunk revision 1484507


Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1484507

Modified: db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1485264&r1=1485263&r2=1485264&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Wed May 22 16:04:59 2013
@@ -1240,13 +1240,19 @@ public final class NetworkServerControlI
         String user = null;
         String password = null;
 
-            
+            try {
             writeCommandHeader(COMMAND_TESTCONNECTION);
             writeLDString(database);
             writeLDString(user);
             writeLDString(password);
             send();
             readResult();
+            } catch (IOException ioe) {
+                consolePropertyMessage("DRDA_NoIO.S",
+                        new String [] {hostArg, 
+                        (new Integer(portNumber)).toString(), 
+                        ioe.getMessage()}); 
+    }
     }
 
 
@@ -3532,7 +3538,7 @@ public final class NetworkServerControlI
      */
     private boolean isMsgProperty(String msg)
     {
-        if (msg.startsWith(DRDA_MSG_PREFIX))
+        if (msg != null && msg.startsWith(DRDA_MSG_PREFIX))
             return true;
         else
             return false;



Mime
View raw message