2000-08-26 Anthony Green <green@redhat.com>

        * Makefile.in: Rebuilt.
        * Makefile.am (java/lang/ClassLoader.h): Make _Jv_RunMain a
        friend.

        * prims.cc: Include ClassLoader.h.
        (_Jv_RunMain): When executing jar files, classpath must be the jar
        file only.  Lose our reference to the system ClassLoader in order
        to get a new one with the correct classpath.
        * java/lang/natSystem.cc (init_properties): When executing a jar
        file, only use the jar file for java.class.path.

        * gnu/gcj/runtime/VMClassLoader.java: Use the canonical file name
        for bytecode archives.

        * gnu/gcj/runtime/FirstThread.java: Handle case where manifest
        exists, but not Main-Class.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35999 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 21 insertions, 24 deletions

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 81f7860dad0..2672895c6a4 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -348,34 +348,31 @@ java::lang::System::init_properties (void)
 	}
     }
 
-  // FIXME: find libgcj.zip and append its path?
-  char *classpath = ::getenv("CLASSPATH");
-  jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path"));
-  java::lang::StringBuffer *sb = new java::lang::StringBuffer ();
-
   if (_Jv_Jar_Class_Path)
+    properties->put(JvNewStringLatin1 ("java.class.path"),
+		    JvNewStringLatin1 (_Jv_Jar_Class_Path));
+  else
     {
-      sb->append (JvNewStringLatin1 (_Jv_Jar_Class_Path));
-#ifdef WIN32
-      sb->append ((jchar) ';');
-#else
-      sb->append ((jchar) ':');
-#endif;
-    }
-  if (classpath)
-    {
-      sb->append (JvNewStringLatin1 (classpath));
+      // FIXME: find libgcj.zip and append its path?
+      char *classpath = ::getenv("CLASSPATH");
+      jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path"));
+      java::lang::StringBuffer *sb = new java::lang::StringBuffer ();
+      
+      if (classpath)
+	{
+	  sb->append (JvNewStringLatin1 (classpath));
 #ifdef WIN32
-      sb->append ((jchar) ';');
+	  sb->append ((jchar) ';');
 #else
-      sb->append ((jchar) ':');
+	  sb->append ((jchar) ':');
 #endif;
+	}
+      if (cp != NULL)
+	sb->append (cp);
+      else
+	sb->append ((jchar) '.');
+      
+      properties->put(JvNewStringLatin1 ("java.class.path"),
+		      sb->toString ());
     }
-  if (cp != NULL)
-    sb->append (cp);
-  else
-    sb->append ((jchar) '.');
-
-  properties->put(JvNewStringLatin1 ("java.class.path"),
-		  sb->toString ());
 }