From 0f770551cebca90c92b7a39b0e0135a445af51f9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sat, 22 Mar 2008 02:28:22 +0000
Subject: merging in pdj-0.8.4.tar.gz from
 http://www.le-son666.com/software/pdj/

svn path=/trunk/externals/loaders/pdj/; revision=9624
---
 src/init.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/init.c')

diff --git a/src/init.c b/src/init.c
index 4666367..b147db4 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,5 +1,5 @@
 /**
- * This code is very ugly and needs rewrite. PERIOD.
+ * initialization
  */
  
 #include <stdio.h>
@@ -97,7 +97,7 @@ static void load_properties() {
 }
 
 
-static void copyToJavaSystemProperties(JNIEnv *env) {
+void copyToJavaSystemProperties(JNIEnv *env) {
 	jclass system = (*env)->FindClass(env, "java/lang/System");		
 	jmethodID id = (*env)->GetStaticMethodID(env, system, "setProperty", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
 	int i;
@@ -232,8 +232,8 @@ static int linkClasses(JNIEnv *env) {
 }
 
 
-void buildVMOptions(jint *nb, JavaVMOption *options) {
-	static char cp[BUFFER_SIZE], pdj_cp[BUFFER_SIZE];
+static void buildVMOptions(jint *nb, JavaVMOption *options) {
+	static char cp[BUFFER_SIZE];
 	char installPath[BUFFER_SIZE];
 	char *prop;
 	char *token, *work;
@@ -316,7 +316,7 @@ JNIEnv *init_jvm(void) {
 	vm_args.options = opt;
     vm_args.version = JNI_VERSION_1_4;
     vm_args.ignoreUnrecognized = JNI_FALSE; 
-		
+				
 	vm_type = pdj_getProperty("pdj.vm_type");
 	if ( vm_type == NULL ) {
 		error("pdj: unknown vm_type, using client");
@@ -332,12 +332,12 @@ JNIEnv *init_jvm(void) {
 		error("pdj: unable to create JVM: JNI_CreateJavaVM = %d", rc);
 		return NULL;
 	}
-
-	copyToJavaSystemProperties(jni_env);
-	if ( initIDCaching(jni_env) != 0) {
+	    
+	if ( initIDCaching(jni_env) != 0 ) {
 		return NULL;
 	}
 	
+	copyToJavaSystemProperties(jni_env);
 	if ( linkClasses(jni_env) != 0 ) {
 		return NULL;
 	}
-- 
cgit v1.2.1