Changeset 917 for trunk/zoo-project/zoo-kernel/service_internal_java.c

Timestamp:

May 7, 2019, 2:17:08 PM (5 years ago)

Author:

djay

Message:

Merge prototype-v0 branch in trunk

Location:

trunk

Files:

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

trunk/zoo-project/zoo-kernel/service_internal_java.c

@@ -208 +208 @@
 #endif
 #ifdef JAVA7
-  cls_gr = (*env)NewGlobalRef(cls);
+  cls_gr = (*env).NewGlobalRef(cls);
 #else
   cls_gr = (*env)->NewGlobalRef(env, cls);
@@ -215 +215 @@
   if (cls != NULL) {
 #ifdef JAVA7
-@    (*env).ExceptionClear();
+    (*env).ExceptionClear();
     pmid=(*env).GetStaticMethodID(cls, s->name, "(Ljava/util/HashMap;Ljava/util/HashMap;Ljava/util/HashMap;)I");
 #else
@@ -284 +284 @@
   }
 #ifdef JAVA7
-      (*jvm).DestroyJavaVM();
+  (*jvm).DestroyJavaVM();
 #else
   (*jvm)->DestroyJavaVM(jvm);
@@ -427 +427 @@
 #endif
       map* sizeV=getMap(tmp1,"size");
+      map* useFile=getMap(tmp1,"use_file");
+      map* cacheFile=getMap(tmp1,"cache_file");
       map* isArray=getMap(tmp1,"isArray");
       map* alen=getMap(tmp1,"length");
@@ -432 +434 @@
         if(strcmp(tmp1->name,"value")==0){
           if(isArray==NULL){
-            if(sizeV!=NULL && strcmp(tmp1->name,"value")==0){
+            if(sizeV!=NULL && strcmp(tmp1->name,"value")==0 && useFile==NULL){
 #ifdef JAVA7
               jbyteArray tmpData=(*env).NewByteArray(atoi(sizeV->value));
               (*env).SetByteArrayRegion(tmpData,0,atoi(sizeV->value),(const jbyte *)tmp1->value);
-              (*env).CallObjectMethod(env,scObject1, put_mid, (*env).NewStringUTF(env,tmp1->name), tmpData);
+              (*env).CallObjectMethod(scObject1, put_mid, (*env).NewStringUTF(tmp1->name), tmpData);
 #else
               jbyteArray tmpData=(*env)->NewByteArray(env,atoi(sizeV->value));
@@ -448 +450 @@
               (*env)->CallObjectMethod(env,scObject1, put_mid, (*env)->NewStringUTF(env,tmp1->name), (*env)->NewStringUTF(env,tmp1->value));
 #endif
+              if(useFile!=NULL)
+#ifdef JAVA7
+                (*env).CallObjectMethod(scObject1, put_mid, (*env).NewStringUTF("cache_file"), (*env).NewStringUTF(cacheFile->value));
+#else
+                (*env)->CallObjectMethod(env,scObject1, put_mid, (*env)->NewStringUTF(env,"cache_file"), (*env)->NewStringUTF(env,cacheFile->value));
+#endif
+              
           }
           else{
@@ -455 +464 @@
             jclass scArrayListClass,scArrayList_class;
             jmethodID scArrayList_constructor;
-            jobject scObject2;
+            jobject scObject2,scObject3;
 #ifdef JAVA7
             scArrayListClass = (*env).FindClass("java/util/ArrayList");
@@ -462 +471 @@
             jmethodID add_mid = 0;
             scObject2 = (*env).NewObject(scArrayList_class, scArrayList_constructor);
+            scObject3 = (*env).NewObject(scArrayList_class, scArrayList_constructor);
 
             add_mid = (*env).GetMethodID(scArrayListClass,
@@ -471 +481 @@
             jmethodID add_mid = 0;
             scObject2 = (*env)->NewObject(env, scArrayList_class, scArrayList_constructor);
+            scObject3 = (*env)->NewObject(env, scArrayList_class, scArrayList_constructor);
 
             add_mid = (*env)->GetMethodID(env,scArrayListClass,
@@ -478 +489 @@
             
             for(i=0;i<alen1;i++){
+              map* cMap=getMapArray(tmp->content,"cache_file",i);
+              map* uMap=getMapArray(tmp->content,"use_file",i);
               map* vMap=getMapArray(tmp->content,"value",i);
               map* sMap=getMapArray(tmp->content,"size",i);
               map* mMap=getMapArray(tmp->content,tmap->value,i);
               
-              if(sMap!=NULL && vMap!=NULL && strncmp(vMap->name,"value",5)==0){
+              if(sMap!=NULL && vMap!=NULL && strncmp(vMap->name,"value",5)==0 && uMap==NULL){
 #ifdef JAVA7
                 jbyteArray tmpData=(*env).NewByteArray(atoi(sMap->value));
@@ -501 +514 @@
 #endif
               }
-              
+
+              if(cMap!=NULL){
+#ifdef JAVA7
+                jobject tmpData=(*env).NewStringUTF(cMap->value);
+                (*env).CallObjectMethod(scObject3, add_mid, tmpData);
+#else
+                jobject tmpData=(*env)->NewStringUTF(env,cMap->value);
+                (*env)->CallObjectMethod(env,scObject3, add_mid, tmpData);
+#endif
+
+              }
             }
 
 #ifdef JAVA7
             (*env).CallObjectMethod(scObject1, put_mid, (*env).NewStringUTF(tmp1->name), scObject2);
+            (*env).CallObjectMethod(scObject1, put_mid, (*env).NewStringUTF("cache_file"), scObject3);
 #else       
             (*env)->CallObjectMethod(env,scObject1, put_mid, (*env)->NewStringUTF(env,tmp1->name), scObject2);
+            (*env)->CallObjectMethod(env,scObject1, put_mid, (*env)->NewStringUTF(env,"cache_file"), scObject3);
 #endif