瀏覽代碼

HPCC-10186 Better Java Support for JAR Files and the ClassPath

Fixes following code review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 年之前
父節點
當前提交
0d99f63d82
共有 2 個文件被更改,包括 7 次插入4 次删除
  1. 3 3
      plugins/javaembed/javaembed.cpp
  2. 4 1
      testing/regress/ecl/javaimport.ecl

+ 3 - 3
plugins/javaembed/javaembed.cpp

@@ -123,7 +123,7 @@ public:
         JavaVMOption* options = new JavaVMOption[optionStrings.length()];
         ForEachItemIn(idx, optionStrings)
         {
-            DBGLOG("javaembed: Setting JVM option: %s",(char *)optionStrings.item(idx));
+            // DBGLOG("javaembed: Setting JVM option: %s",(char *)optionStrings.item(idx));
             options[idx].optionString = (char *) optionStrings.item(idx);
             options[idx].extraInfo = NULL;
         }
@@ -309,7 +309,7 @@ public:
             ForEachItemIn(idx, paths)
             {
                 StringBuffer testpath;
-                testpath.append("file:").append(paths.item(idx));  // MORE - is the file: useful ?
+                testpath.append(paths.item(idx));
                 jstring jstr = JNIenv->NewStringUTF(testpath.str());
                 checkException();
                 jobject URLobj = JNIenv->NewObject(URLcls, URLclsMid, jstr);
@@ -319,7 +319,7 @@ public:
                 JNIenv->DeleteLocalRef(jstr);
             }
             checkException();
-            jclass customLoaderClass = (jclass) JNIenv->NewGlobalRef(JNIenv->FindClass("java/net/URLClassLoader"));
+            jclass customLoaderClass = JNIenv->FindClass("java/net/URLClassLoader");
             checkException();
             jmethodID newInstance = JNIenv->GetStaticMethodID(customLoaderClass, "newInstance","([Ljava/net/URL;Ljava/lang/ClassLoader;)Ljava/net/URLClassLoader;");
             checkException();

+ 4 - 1
testing/regress/ecl/javaimport.ecl

@@ -1,6 +1,7 @@
 import java;
 string jcat(string a, string b) := IMPORT(java, 'JavaCat.cat:(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;' : classpath('/opt/HPCCSystems/moreclasses/'));
 
+/*
 integer jadd(integer a, integer b) := IMPORT(java, 'JavaCat.add:(II)I');
 integer jaddl(integer a, integer b) := IMPORT(java, 'JavaCat.addL:(II)J');
 integer jaddi(integer a, integer b) := IMPORT(java, 'JavaCat.addI:(II)Ljava/lang/Integer;');
@@ -8,8 +9,9 @@ integer jaddi(integer a, integer b) := IMPORT(java, 'JavaCat.addI:(II)Ljava/lang
 real jfadd(real4 a, real4 b) := IMPORT(java, 'JavaCat.fadd:(FF)F');
 real jdadd(real a, real b) := IMPORT(java, 'JavaCat.dadd:(DD)D');
 real jdaddD(real a, real b) := IMPORT(java, 'JavaCat.daddD:(DD)Ljava/lang/Double;');
-
+*/
 jcat('Hello ', 'world!');
+/*
 jadd(1,2);
 jaddl(3,4);
 jaddi(5,6);
@@ -17,3 +19,4 @@ jaddi(5,6);
 jfadd(1,2);
 jdadd(3,4);
 jdaddD(5,6);
+*/