diff options
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/convert/natIconv.cc | 4 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/FileDeleter.java | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index 7875e9b7922..fe79dc12515 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -70,8 +70,6 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer, jint outpos, jint count) { #ifdef HAVE_ICONV - jint origpos = outpos; - jbyte *bytes = elements (inbuffer); jchar *out = elements (outbuffer); size_t inavail = inlength - inpos; @@ -131,8 +129,6 @@ gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer, jint inpos, jint count) { #ifdef HAVE_ICONV - jint origpos = inpos; - jchar *chars = elements (inbuffer); jbyte *out = elements (buf); diff --git a/libjava/gnu/gcj/runtime/FileDeleter.java b/libjava/gnu/gcj/runtime/FileDeleter.java index cc7aa9d50b7..d5f99d04c47 100644 --- a/libjava/gnu/gcj/runtime/FileDeleter.java +++ b/libjava/gnu/gcj/runtime/FileDeleter.java @@ -23,16 +23,13 @@ public final class FileDeleter // Helper method called by java.lang.Runtime.exit() to perform // pending deletions. - public static void deleteOnExitNow () + public synchronized static void deleteOnExitNow () { - while (!deleteOnExitStack.empty ()) - ((File)(deleteOnExitStack.pop ())).delete (); + if (deleteOnExitStack != null) + while (!deleteOnExitStack.empty ()) + ((File)(deleteOnExitStack.pop ())).delete (); } // A stack of files to delete upon normal termination. private static Stack deleteOnExitStack; } - - - - |
