From 21a54cdf55476e7c704b83cfe4a4745a7ae4f38f Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 30 Nov 2010 20:25:48 -0700 Subject: [PATCH] set java.protocol.handler.pkgs on Windows as well as Posix Also, fix cut-and-paste error where we should have called fieldAddendum instead of methodAddendum. --- src/classpath-openjdk.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp index 2e08333c2a..8469568927 100644 --- a/src/classpath-openjdk.cpp +++ b/src/classpath-openjdk.cpp @@ -1853,10 +1853,11 @@ EXPORT(JVM_InitProperties)(Thread* t, jobject properties) local::setProperty(t, method, *properties, "java.io.tmpdir", "/tmp"); local::setProperty(t, method, *properties, "user.home", getenv("HOME")); local::setProperty(t, method, *properties, "user.dir", getenv("PWD")); +#endif + local::setProperty(t, method, *properties, "java.protocol.handler.pkgs", "avian"); -#endif local::setProperty (t, method, *properties, "java.home", static_cast(t->m->classpath)->javaHome); @@ -2776,7 +2777,7 @@ EXPORT(JVM_GetClassDeclaredFields)(Thread* t, jclass c, jboolean publicOnly) object runtimeData = getClassRuntimeData(t, jclassVmClass(t, *c)); set(t, runtimeData, ClassRuntimeDataPool, - addendumPool(t, methodAddendum(t, vmField))); + addendumPool(t, fieldAddendum(t, vmField))); } object field = makeJfield