natIconv.cc (Input_iconv::finalize): Call iconv_close when handle is not NULL.

	* gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call
	iconv_close when handle is not NULL.  Thanks to Andrew Haley.
	(Output_iconv::finalize): Likewise.

From-SVN: r31876

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e19e4ef3883ac6a36f37a094ff6ba12ea5bffd18..94a1543ef55e4e3c3abafc98e3c271bf9d0c83ec 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-09  Tom Tromey  <tromey@cygnus.com>
+
+       * gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call
+       iconv_close when handle is not NULL.  Thanks to Andrew Haley.
+       (Output_iconv::finalize): Likewise.
+
 2000-02-08  Tom Tromey  <tromey@cygnus.com>
 
        * java/util/Properties.java (setProperty): New method.

diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc
index ee3490a99b72328e368458a92b32e510f0784a43..cc8488fa36970fe8f23c2be5154ead53a842fdde 100644 (file)
--- a/libjava/gnu/gcj/convert/natIconv.cc
+++ b/libjava/gnu/gcj/convert/natIconv.cc
@@ -47,7 +47,7 @@ void
 gnu::gcj::convert::Input_iconv::finalize (void)
 {
 #ifdef HAVE_ICONV
-  if (handle == NULL)
+  if (handle != NULL)
     {
       iconv_close ((iconv_t) handle);
       handle = NULL;
@@ -108,7 +108,7 @@ void
 gnu::gcj::convert::Output_iconv::finalize (void)
 {
 #ifdef HAVE_ICONV
-  if (handle == NULL)
+  if (handle != NULL)
     {
       iconv_close ((iconv_t) handle);
       handle = NULL;