db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1068016 - /db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
Date Mon, 07 Feb 2011 17:08:36 GMT
Author: kmarsden
Date: Mon Feb  7 17:08:36 2011
New Revision: 1068016

URL: http://svn.apache.org/viewvc?rev=1068016&view=rev
Log:
DERBY-4472 [patch] non short circuit op, could cause eof problems

contributed by Dave Brosius (dbrosius at mebigfatguy dot com).


Modified:
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java?rev=1068016&r1=1068015&r2=1068016&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
Mon Feb  7 17:08:36 2011
@@ -84,7 +84,7 @@ public class JarStorageFactory extends B
             return;
         // Parse the dataDirectory name. It should be of the form "(jar-file)directory" or
"jar-file"
         int offset = 0;
-        while( offset < dataDirectory.length() & Character.isSpaceChar( dataDirectory.charAt(
offset)))
+        while( offset < dataDirectory.length() && Character.isSpaceChar( dataDirectory.charAt(
offset)))
             offset ++;
         int leftParen = -1;
         int rightParen = -1;
@@ -99,7 +99,7 @@ public class JarStorageFactory extends B
         {
             jarFile = getJarFile( dataDirectory.substring( leftParen + 1, rightParen));
             offset = rightParen + 1;
-            while( offset < dataDirectory.length() & Character.isSpaceChar( dataDirectory.charAt(
offset)))
+            while( offset < dataDirectory.length() && Character.isSpaceChar( dataDirectory.charAt(
offset)))
                 offset ++;
             dataDirectory = dataDirectory.substring( offset, dataDirectory.length());
         }



Mime
View raw message