/hg/release/icedtea7-forest-2.4/jdk: 4 new changesets

[andrew at icedtea.classpath.org]

changeset 85988345bbcc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=85988345bbcc
author: andrew
date: Mon Sep 09 20:18:12 2013 +0100

	Cleanup file resources properly in TimeZone_md.


changeset 4bf5ac86e0e4 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4bf5ac86e0e4
author: andrew
date: Mon Sep 09 20:18:21 2013 +0100

	Removed tag icedtea-2.4.2


changeset e75bf1c831a5 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e75bf1c831a5
author: andrew
date: Mon Sep 09 20:18:25 2013 +0100

	Added tag icedtea-2.4.2 for changeset 4bf5ac86e0e4


changeset 5a6e6d2ee57d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5a6e6d2ee57d
author: andrew
date: Mon Sep 09 20:28:47 2013 +0100

	Merge


diffstat:

 .hgtags                                    |   5 +++++
 src/solaris/native/java/util/TimeZone_md.c |  12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r e4526d518dac -r 5a6e6d2ee57d .hgtags
--- a/.hgtags	Fri Sep 06 21:36:31 2013 +0100
+++ b/.hgtags	Mon Sep 09 20:28:47 2013 +0100
@@ -355,3 +355,8 @@
 e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
 e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
 0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+e4526d518dacc59adc253c7a6f49a79441d4e3d9 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+4bf5ac86e0e46f1d8eafa18fa64c442666975f6a icedtea-2.4.2
diff -r e4526d518dac -r 5a6e6d2ee57d src/solaris/native/java/util/TimeZone_md.c
--- a/src/solaris/native/java/util/TimeZone_md.c	Fri Sep 06 21:36:31 2013 +0100
+++ b/src/solaris/native/java/util/TimeZone_md.c	Mon Sep 09 20:28:47 2013 +0100
@@ -250,6 +250,7 @@
             }
         }
         (void) fclose(fp);
+	fp = NULL;
         if (tz != NULL) {
             return tz;
         }
@@ -306,12 +307,15 @@
 		    tz = strdup(p);
 		    break; 
 		}
-		(void) fclose(fp);
-		if (tz != NULL) {
-		    return tz;
-		}
 	    }
 	}
+	if (fp != NULL) {
+	    (void) fclose(fp);
+	    fp = NULL;
+	}
+	if (tz != NULL) {
+	    return tz;
+	}
     }
 
     /*