diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-26 21:12:54 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-26 21:12:54 +0000 |
| commit | 98089046971408cada3f74eb4c5310788538f688 (patch) | |
| tree | 9fe78cae5f76c6dd6ff0b305f3340300023071b2 /libjava | |
| parent | a139c1c8f9ae2004e74d9ad4c84cbb63a43b386d (diff) | |
| download | gcc-98089046971408cada3f74eb4c5310788538f688.tar.gz | |
Minor clean up and bug fix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32196 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/gnu/gcj/io/MimeTypes.java | 2 | ||||
| -rw-r--r-- | libjava/java/net/URLConnection.java | 2 | ||||
| -rw-r--r-- | libjava/jni.cc | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e2c84d29dd6..ccf334665d1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2000-02-26 Anthony Green <green@cygnus.com> + + * gnu/gcj/io/MimeTypes.java: Test for null. + + * jni.cc (_Jv_JNI_AttachCurrentThread): Minor cleanup. + (JNI_GetCreatedJavaVMs): Remove compiler warning. + + * java/net/URLConnection.java: Update copyright notice. + 2000-02-25 Tom Tromey <tromey@cygnus.com> * jni.cc (_Jv_JNI_RegisterNatives): Conditionalize body on diff --git a/libjava/gnu/gcj/io/MimeTypes.java b/libjava/gnu/gcj/io/MimeTypes.java index 36d3eb86f14..f4a114bf9e8 100644 --- a/libjava/gnu/gcj/io/MimeTypes.java +++ b/libjava/gnu/gcj/io/MimeTypes.java @@ -36,7 +36,7 @@ public class MimeTypes { // Read the next extension String e = tokenizer.nextToken (); - if (! e.startsWith ("#")) + if ((e != null) && (! e.startsWith ("#"))) table.put (e, t); else break; diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java index 60cfd76714f..8ba61d1afcd 100644 --- a/libjava/java/net/URLConnection.java +++ b/libjava/java/net/URLConnection.java @@ -1,7 +1,7 @@ // URLConnection.java - Superclass of all communications links between // an application and a URL. -/* Copyright (C) 1999 Red Hat, Inc. +/* Copyright (C) 1999, 2000 Red Hat, Inc. This file is part of libgcj. diff --git a/libjava/jni.cc b/libjava/jni.cc index 92dbf3fb26e..3eca405757e 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1545,8 +1545,7 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args) // have been called simply to set the new JNIEnv. if (_Jv_ThreadCurrent () == NULL) { - java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name); - t = t; // Avoid compiler warning. Eww. + (void) new gnu::gcj::jni::NativeThread (group, name); } _Jv_SetCurrentJNIEnv (env); @@ -1707,7 +1706,7 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) } jint -JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms) +JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize /* buf_len */, jsize *n_vms) { JvAssert (buf_len > 0); // We only support a single VM. |