Changeset 217 for branches/branch-1.2/zoo-kernel/service_internal_java.c

Timestamp:

May 31, 2011, 3:30:49 AM (13 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/service_internal_java.c (modified) (9 diffs)

branches/branch-1.2/zoo-kernel/service_internal_java.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- * Copyright (c) 2009-2010 GeoLabs SARL
+ * Copyright (c) 2009-2011 GeoLabs SARL
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -118 +118 @@
 
       pValue=(*env)->CallStaticIntMethod(env,cls,pmid,arg1,arg2,arg3);
-      if (pValue != NULL){
+      if (pValue != (jint)NULL){
         res=pValue;
         m=mapsFromHashMap(env,arg1,scHashMapClass);
@@ -233 +233 @@
   jobject scObject,scObject1;
   if(scHashMapClass==NULL){
+#ifdef DEBUG
     fprintf(stderr,"Unable to load java.util.HashMap\n");
+#endif
     return NULL;
   }
@@ -239 +241 @@
   containsKey_mid = (*env)->GetMethodID(env, scHashMapClass, "containsKey", "(Ljava/lang/Object;)Z");
   get_mid = (*env)->GetMethodID(env, scHashMapClass, "get", "(Ljava/lang/Object;)Ljava/lang/Object;"); 
+
   if(containsKey_mid==0){
+#ifdef DEBUG
     fprintf(stderr,"unable to load containsKey from HashMap object (%d) \n",entrySet_mid);
+#endif
+    return NULL;
   }
   if(get_mid==0){
+#ifdef DEBUG
     fprintf(stderr,"unable to load get from HashMap object (%d) \n",entrySet_mid);
+#endif
+    return NULL;
   }
   if(entrySet_mid==0){
+#ifdef DEBUG
     fprintf(stderr,"unable to load entrySet from HashMap object (%d) \n",entrySet_mid);
+#endif
     return NULL;
   }
@@ -296 +307 @@
     if((*env)->CallBooleanMethod(env,imap,containsKey_mid,(*env)->NewStringUTF(env,"size"))){
       jobject sizeV=(*env)->CallObjectMethod(env, imap, get_mid,(*env)->NewStringUTF(env,"size"));
-      jstring sizeVS=(*env)->GetStringUTFChars(env, sizeV, NULL);
+      const char* sizeVS=(*env)->GetStringUTFChars(env, sizeV, NULL);
       size=atoi(sizeVS);
       fprintf(stderr,"SIZE : %s\n",sizeVS);
+      (*env)->ReleaseStringUTFChars(env, sizeV, sizeVS);
     }
     
@@ -306 +318 @@
       jobject jv=(*env)->CallObjectMethod(env,tmp1,getValue_mid);
 
-      jstring jkd=(*env)->GetStringUTFChars(env, jk, NULL);
+      const char* jkd=(*env)->GetStringUTFChars(env, jk, NULL);
       if(size>=0 && strcmp(jkd,"value")==0){
-        fprintf(stderr,"%s\n",jkd);
         jobject value=(*env)->GetByteArrayElements(env, jv, NULL);
         if(res==NULL){
@@ -315 +326 @@
           addToMap(res,jkd,"");
         }
-        fprintf(stderr,"/%s\n",jkd);
         map* tmpR=getMap(res,"value");
         free(tmpR->value);
@@ -321 +331 @@
         memmove(tmpR->value,value,size*sizeof(char));
         tmpR->value[size]=0;
-        fprintf(stderr,"/%s\n",jkd);
+        char tmp[128];
+        sprintf(tmp,"%d",size);
+        addToMap(res,"size",tmp);
       }
       else{
-        jstring jvd=(*env)->GetStringUTFChars(env, jv, NULL);
+        const char* jvd=(*env)->GetStringUTFChars(env, jv, NULL);
         if(res==NULL){
           res=createMap(jkd,jvd);
@@ -330 +342 @@
           addToMap(res,jkd,jvd);
         }
-        (*env)->ReleaseStringChars(env, jv, jvd);
+        (*env)->ReleaseStringUTFChars(env, jv, jvd);
       }
 
-#ifdef DEBUG
-      fprintf(stderr,"%s %s\n",jkd,jvd);
-#endif
-
-      (*env)->ReleaseStringChars(env, jk, jkd);
+      (*env)->ReleaseStringUTFChars(env, jk, jkd);
 
     }