Merge branch '1.0' into 1.1

Zhen Li · Zhen Li · commit c0bf2b35b198 · 2016-10-20T11:46:41.000+02:00
diff --git a/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java b/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java
@@ -178,7 +178,8 @@ private HandshakeStatus unwrap( ByteBuffer buffer ) throws IOException
          */
         if ( channel.read( cipherIn ) < 0 )
         {
-            throw new ClientException( "Failed to establish SSL socket connection." );
+            throw new ClientException( "SSL Connection terminated while receiving data. " +
+                    "This can happen due to network instabilities, or due to restarts of the database." );
         }
         cipherIn.flip();
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,8 @@ private HandshakeStatus unwrap( ByteBuffer buffer ) throws IOException`
`178`	`178`	`*/`
`179`	`179`	`if ( channel.read( cipherIn ) < 0 )`
`180`	`180`	`{`
`181`		`- throw new ClientException( "Failed to establish SSL socket connection." );`
	`181`	`+ throw new ClientException( "SSL Connection terminated while receiving data. " +`
	`182`	`+ "This can happen due to network instabilities, or due to restarts of the database." );`
`182`	`183`	`}`
`183`	`184`	`cipherIn.flip();`
`184`	`185`