Revert "JORTE: add deserialize function to support endianness setting"

This reverts commit 683e5f61f3e7b6c1ade1b4910264d8f96781ade0.

diff --git a/orte/include/jorte/org_ocera_orte_DomainApp.h b/orte/include/jorte/org_ocera_orte_DomainApp.h
index 194760d954f513346349bc32103bf3c1fcbd984d..9fbe1d43fd17e18babbf367cb93735e90f91e2d8 100644 (file)
--- a/orte/include/jorte/org_ocera_orte_DomainApp.h
+++ b/orte/include/jorte/org_ocera_orte_DomainApp.h
@@ -37,7 +37,7 @@ JNIEXPORT jboolean JNICALL Java_org_ocera_orte_DomainApp_jORTEDomainAppDestroy
  * Signature: (JLjava/lang/String;J)I
  */
 JNIEXPORT jint JNICALL Java_org_ocera_orte_DomainApp_jORTETypeRegisterAdd
-  (JNIEnv *, jobject, jlong, jstring, jlong, jobject);
+  (JNIEnv *, jobject, jlong, jstring, jlong);
 
 /*
  * Class:     org_ocera_orte_DomainApp

diff --git a/orte/java/src/org/ocera/orte/DomainApp.java b/orte/java/src/org/ocera/orte/DomainApp.java
index 32d2a2c189cbabf29ed6c7c8d92938d8b9b31ba3..771f5fe42cfebd89cde1cc632b5b6fb1effc15d2 100644 (file)
--- a/orte/java/src/org/ocera/orte/DomainApp.java
+++ b/orte/java/src/org/ocera/orte/DomainApp.java
@@ -22,8 +22,6 @@
  */
 
 package org.ocera.orte;
-import java.nio.ByteBuffer;
-
 import  org.ocera.orte.types.*;
 
 
@@ -85,13 +83,11 @@ public class DomainApp extends Domain
     */
    public
    boolean regNewDataType(String name,
-                                                 long maxlength,
-                                                 ByteBuffer buffer)
+                                                 long maxlength)
    {
      int b = jORTETypeRegisterAdd(this.handle, 
                                      name,
-                                  maxlength,
-                                  buffer);
+                                  maxlength);
         if (b == ORTEConstant.ORTE_BAD_HANDLE)
      {
        System.out.println(":!j: regNewDataType() failed! [bad domain handle]");
@@ -223,8 +219,7 @@ public class DomainApp extends Domain
   private native
   int jORTETypeRegisterAdd(long dhandle,
                             String typeName,
-                            long maxlenght,
-                            ByteBuffer buffer);
+                            long maxlenght);
 
 
  /**

diff --git a/orte/java/src/org/ocera/orte/examples/hello/HelloMsg.java b/orte/java/src/org/ocera/orte/examples/hello/HelloMsg.java
index a60ece7281205d167d5cc27620b8fbb7f9f4ec8a..b87bf5d8066d91d6db906cb4537df776a1b00b8a 100644 (file)
--- a/orte/java/src/org/ocera/orte/examples/hello/HelloMsg.java
+++ b/orte/java/src/org/ocera/orte/examples/hello/HelloMsg.java
@@ -37,7 +37,7 @@ public class HelloMsg extends org.ocera.orte.types.MessageData
             counter++;
          this.setTopic(newTopic); // set the topic of a publication 
          // register new data typeName    
-        b = domainApp.regNewDataType(this.getType(),getMaxDataLength(),this.buffer); 
+        b = domainApp.regNewDataType(this.getType(),getMaxDataLength()); 
             if (b == false) 
             {
               System.out.println(":j!: cannot register data type!");    

diff --git a/orte/java/src/org/ocera/orte/examples/robot/RoboMsg.java b/orte/java/src/org/ocera/orte/examples/robot/RoboMsg.java
index 57e7a3dafc6b86ae115f97da8bc8ab808b6827eb..fee386556c4f8d43192f23b2cf0baf0772ea0117 100644 (file)
--- a/orte/java/src/org/ocera/orte/examples/robot/RoboMsg.java
+++ b/orte/java/src/org/ocera/orte/examples/robot/RoboMsg.java
@@ -40,7 +40,7 @@ public class RoboMsg extends org.ocera.orte.types.MessageData
             counter++;
          this.setTopic(newTopic); // set the topic of a publication 
          // register new data typeName    
-        b = domainApp.regNewDataType("motion_speed",getMaxDataLength(),this.buffer); 
+        b = domainApp.regNewDataType("motion_speed",getMaxDataLength()); 
             if (b == false) 
             {
               System.out.println(":j!: cannot register data type!");    

diff --git a/orte/libjorte/JORTETypeRegisterAdd.c b/orte/libjorte/JORTETypeRegisterAdd.c
index f5e6718c2e01c9335ae63e62d4bdf49caa8e258c..73e9c640ad6080bbe9424df5de4d4a4dae3d6c69 100644 (file)
--- a/orte/libjorte/JORTETypeRegisterAdd.c
+++ b/orte/libjorte/JORTETypeRegisterAdd.c
@@ -25,112 +25,16 @@
   *
   */
 
-#include <jni.h>
-#include <string.h>
+
 // library header file's path
 #include "orte.h"
 // pregenerated header
 #include "jorte/org_ocera_orte_DomainApp.h"
-#include "jorte/jorte_protos_api.h"
 #include "jorte/4all.h"
 
-extern JavaVM *javavm;
-static jobject byte_buf;
-
-void deserialize(CDR_Codec *cdrCodec, void *instance) {
-  JNIEnv        *env = 0;
-  jclass         cls = 0;
-  jfieldID       fid = 0;
-  jmethodID      mid = 0;
-  jobject        obj_bo = 0;
-
-  //set byte order only once
-  if(byte_buf) {
-    // get environment
-    (*javavm)->AttachCurrentThread(javavm, (void **)&env, NULL);
-    if(env == 0)
-    {
-      #ifdef TEST_STAGE
-       printf(":!c: env = NULL \n");
-      #endif
-    }
-
-    //prepare ByteOrder
-    cls = (*env)->FindClass(env, "java/nio/ByteOrder");
-    if (cls == 0) {
-      #ifdef TEST_STAGE
-        printf(":!c: cls = NULL \n");
-      #endif
-    }
-    if(cdrCodec->data_endian == BigEndian) {
-      fid = (*env)->GetStaticFieldID(env,
-                                        cls,
-                                        "BIG_ENDIAN",
-                                        "Ljava/nio/ByteOrder;");
-    }
-    else {
-      fid = (*env)->GetStaticFieldID(env,
-                                        cls,
-                                        "LITTLE_ENDIAN",
-                                        "Ljava/nio/ByteOrder;");
-    }
-    if(fid == 0) {
-      #ifdef TEST_STAGE
-           printf(":!c: fid = NULL \n");
-         #endif
-    }
-    obj_bo = (*env)->GetStaticObjectField(env, cls, fid);
-    if(obj_bo == 0) {
-      #ifdef TEST_STAGE
-           printf(":!c: cls = NULL \n");
-         #endif
-    }
-
-    // set byte order to ByteBuffer
-    // get BB class
-    cls = (*env)->GetObjectClass(env, byte_buf);
-    if(cls == 0)
-    {
-      #ifdef TEST_STAGE
-        printf(":!c: cls = NULL \n");
-      #endif
-    }
-    // get methodID - order(ByteOrder)
-    mid = (*env)->GetMethodID(env,
-                             cls,
-                             "order",
-                             "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;");
-    if(mid == 0)
-    {
-      #ifdef TEST_STAGE
-        printf(":!c: mid = NULL \n");
-      #endif
-    }
-
-    // set ByteOrder
-    if((*env)->CallObjectMethod(env,byte_buf,mid,obj_bo) == 0)
-    {
-      #ifdef TEST_STAGE
-        printf(":!c: set byte order failed.. \n");
-      #endif
-    }
-
-    // delete global reference
-    (*env)->DeleteGlobalRef(env, byte_buf);
-    byte_buf = 0;
-
-    (*javavm)->DetachCurrentThread(javavm);
-  }
-
-  //copy over the message instance
-  memcpy(instance,
-         cdrCodec->buffer,
-         cdrCodec->buf_len);
-}
-
 JNIEXPORT jint JNICALL
 Java_org_ocera_orte_DomainApp_jORTETypeRegisterAdd
-(JNIEnv *env, jclass cls, jlong handle, jstring jname, jlong jlength, jobject obj_bb)
+(JNIEnv *env, jclass cls, jlong handle, jstring jname, jlong jlength)
 {
   const char     *name;
   int            b;
@@ -141,14 +45,11 @@ Java_org_ocera_orte_DomainApp_jORTETypeRegisterAdd
   b = ORTETypeRegisterAdd((ORTEDomain *) handle,
                           name,
                           NULL,
-                          (ORTETypeDeserialize)deserialize,
+                          NULL,
                           NULL,
                           (unsigned int) jlength);
   // free memmory space
   (*env)->ReleaseStringUTFChars(env,jname,name);
-
-  byte_buf = (*env)->NewGlobalRef(env, obj_bb);
-
   #ifdef TEST_STAGE
   printf(":c: jORTETypeRegisterAdd vraci %d [%d = ORTE_OK, %d = ORTE_BAD_HANDLE] \n",
          b,ORTE_OK,ORTE_BAD_HANDLE);

diff --git a/orte/libjorte/onLoad.c b/orte/libjorte/onLoad.c
index 21d56b7120ca82e9e9f79aca90e286cfa31f850b..f7b8e484e129802156fe0474b482b4f73485d4c5 100644 (file)
--- a/orte/libjorte/onLoad.c
+++ b/orte/libjorte/onLoad.c
@@ -5,8 +5,6 @@ static jmethodID findClassM;
 static jmethodID findLoadedClassM;
 static jobject classLoader;
 
-JavaVM *javavm;
-
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
   JNIEnv *env;
   jclass testCl;
@@ -15,7 +13,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
   jmethodID getClassLoader;
 
   (*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_6);
-  javavm = vm;
 
   testCl = (*env)->FindClass(env, "org/ocera/orte/JOrte");
   clClass = (*env)->FindClass(env, "java/lang/Class");