jcifs-1.2.21 from tgz

Wed May 28 22:46:56 EDT 2008

An NPE in jcifs.Config was accidentally introduced in 1.2.20. This has
been fixed.

diff --git a/README.txt b/README.txt
index 4f920cb..e939aae 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,12 +1,14 @@
+Wed May 28 22:46:56 EDT 2008
+
+An NPE in jcifs.Config was accidentally introduced in 1.2.20. This has
+been fixed.
+
 Tue May 27 16:06:13 EDT 2008
 jcifs-1.2.20
 
 The Dfs cache was not thread safe. This has been fixed. The trusted
 domains are now looked up with <1C> NetBIOS lookups to speed discovery.
 
-Wed Apr 16 17:45:52 EDT 2008
-jcifs-1.2.20b
-
 EMC could return "Access denied" for the SMB_COM_FIND_CLOSE2 on a
 read-only share. A try catch was added to ignore errors for that request
 since it otherwise has no logical importance. Examining a capture of XP

diff --git a/build.xml b/build.xml
index 172f2b9..8a20066 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="jcifs" default="usage" basedir=".">
 
-    <property name="version" value="1.2.20"/>
-    <property name="reldate" value="May 27, 2008"/>
+    <property name="version" value="1.2.21"/>
+    <property name="reldate" value="May 28, 2008"/>
 
     <target name="usage">
         <echo>

diff --git a/src/jcifs/Config.java b/src/jcifs/Config.java
index ef4f388..c00e434 100644 (file)
--- a/src/jcifs/Config.java
+++ b/src/jcifs/Config.java
@@ -68,7 +68,8 @@ public static int socketCount = 0;
                 in = new FileInputStream( filename );
             }
             Config.load( in );
-            in.close();
+            if (in != null)
+                in.close();
         } catch( IOException ioe ) {
             if( log.level > 0 )
                 ioe.printStackTrace( log );