Changeset 1661 for trunk/bindings

Timestamp:

21/10/11 21:08:29 (7 months ago)

Author:

Peter Peterson

Message:

Refs #286.

File:

• trunk/bindings/java/native/NexusFile.c (modified) (31 diffs)

trunk/bindings/java/native/NexusFile.c

@@ -192 +192 @@
     /* kill handle */
     HHRemoveHandle(handle);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXclose failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -219 +223 @@
     (*env)->ReleaseStringUTFChars(env,nxclass, Nxclass);
 
+    if (iRet != NX_OK) {
+      JapiError(env, "NXmakegroup failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -251 +258 @@
     (*env)->ReleaseStringUTFChars(env,name, Name);
     (*env)->ReleaseStringUTFChars(env,nxclass, Nxclass);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXopengroup failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -281 +292 @@
     /* release strings */
     (*env)->ReleaseStringUTFChars(env,path, nxpath);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXopenpath failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -311 +326 @@
     /* release strings */
     (*env)->ReleaseStringUTFChars(env,path, nxpath);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXopengrouppath failed");
+    }
 }
 /*-----------------------------------------------------------------------*/
@@ -326 +345 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 
-    iRet = NXgetpath(nxhandle, path,1024);
-    
+    if (NXgetpath(nxhandle, path,1024) != NX_OK) {
+      JapiError(env, "NXgetpath failed");
+    }
+
     return (*env)->NewStringUTF(env,path);
 }
@@ -346 +367 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 
-    iRet = NXclosegroup(nxhandle);
-
+    if (NXclosegroup(nxhandle) != NX_OK) {
+      JapiError(env, "NXclosegroup failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -379 +401 @@
     (*env)->ReleaseIntArrayElements(env,dim,iDim,0);  
 
+    if (iRet != NX_OK) {
+      JapiError(env, "NXmakedata failed");
+    }
 }
 /*-----------------------------------------------------------------------
@@ -414 +439 @@
     (*env)->ReleaseIntArrayElements(env,dim,iDim,0);  
     (*env)->ReleaseIntArrayElements(env,chunk,iChunk,0);  
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXcompmakedata failed");
+    }
 }
 
@@ -439 +468 @@
     /* clean up */ 
     (*env)->ReleaseStringUTFChars(env,name, Name);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXopendata failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -455 +488 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 
-    iRet = NXclosedata(nxhandle);
-
+    if (NXclosedata(nxhandle) != NX_OK) {
+      JapiError(env, "NXclosedata failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -476 +510 @@
     fprintf(stderr,"Compressing at %d with type %d\n", nxhandle, comp_type);
 #endif
-    iRet = NXcompress(nxhandle,comp_type);
+
+    if (NXcompress(nxhandle,comp_type) != NX_OK) {
+      JapiError(env, "NXcompress failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -501 +538 @@
     /* cleanup */
     (*env)->ReleaseByteArrayElements(env,data,bdata,0);   
+    if(iRet != NX_OK)
+    {
 #ifdef DEBUG
-    if(iRet != NX_OK)
-    {
-        HEprint(stderr,0);
-    }
-#endif
+      HEprint(stderr,0);
+#else
+      JapiError(env, "NXputdata failed");
+#endif
+    }
 }
 /*------------------------------------------------------------------------
@@ -538 +577 @@
     (*env)->ReleaseIntArrayElements(env,start,iStart,0);  
     (*env)->ReleaseIntArrayElements(env,end,iEnd,0);  
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXputslab failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -593 +636 @@
     (*env)->ReleaseByteArrayElements(env,data,bdata,0);   
     (*env)->ReleaseStringUTFChars(env,name, Name);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXputattr failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -617 +664 @@
     /* cleanup */
     (*env)->ReleaseByteArrayElements(env,data,bdata,0);   
+    if(iRet != NX_OK)
+    {
 #ifdef DEBUG
-    if(iRet != NX_OK)
-    {
-        HEprint(stderr,0);
-    }
-#endif
+      HEprint(stderr,0);
+#else
+      JapiError(env, "NXgetdata failed");
+#endif
+    }
 }
 /*------------------------------------------------------------------------
@@ -647 +696 @@
     iEnd = (*env)->GetIntArrayElements(env,end,0);
 
-
     iRet = NXgetslab(nxhandle, bdata, iStart, iEnd);
 
@@ -654 +702 @@
     (*env)->ReleaseIntArrayElements(env,start,iStart,0);  
     (*env)->ReleaseIntArrayElements(env,end,iEnd,0);  
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXgetslab failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -700 +752 @@
     (*env)->ReleaseStringUTFChars(env,name, Name);
     (*env)->ReleaseIntArrayElements(env,args,iargs,0);  
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXgetattr failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -875 +931 @@
     NXhandle nxhandle;
     NXlink myLink;
-    int iRet;
     jclass cls;
     jfieldID fid;
@@ -951 +1006 @@
 
      // do actually link
-     iRet = NXmakelink(nxhandle, &myLink);
+     if (NXmakelink(nxhandle, &myLink) != NX_OK) {
+       JapiError(env, "NXmakelink failed");
+     }
 }
 /*------------------------------------------------------------------------
@@ -961 +1018 @@
     NXhandle nxhandle;
     NXlink myLink;
-    int iRet;
     jclass cls;
     jfieldID fid;
@@ -1040 +1096 @@
      (*env)->ReleaseStringUTFChars(env, jstr, cData);
 
-
      // do actually link
-     iRet = NXmakenamedlink(nxhandle, Name,  &myLink);
+     if (NXmakenamedlink(nxhandle, Name,  &myLink) != NX_OK) {
+       JapiError(env, "NXmakenamedlink failed");
+     }
 }
 
@@ -1052 +1109 @@
 {
     NXhandle nxhandle;
-    int iRet;
-
-    /* set error handler */
-    NXMSetTError(env,JapiError);
-
-    /* exchange the Java handler to a NXhandle */
-    nxhandle =  (NXhandle)HHGetPointer(handle);
-
-    iRet = NXopensourcegroup(nxhandle);
-
-}
+
+    /* set error handler */
+    NXMSetTError(env,JapiError);
+
+    /* exchange the Java handler to a NXhandle */
+    nxhandle =  (NXhandle)HHGetPointer(handle);
+
+    if (NXopensourcegroup(nxhandle) != NX_OK) {
+       JapiError(env, "NXopensourcegroup failed");
+     }
+}
+
 /*----------------------------------------------------------------------
                            nxsetnumberformat
@@ -1092 +1150 @@
     */ 
     (*env)->ReleaseStringUTFChars(env,format, cformat);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXsetnumberformat failed");
+    }
 }
 /*------------------------------------------------------------------------
@@ -1208 +1270 @@
 (JNIEnv *env, jobject obj, jint handle, jstring name, 
  jstring nxclass, jstring nxurl){
-    int status;
+    int iRet;
     NXhandle nxhandle;
     char *Name, *Nxclass, *Nxurl;
@@ -1222 +1284 @@
     Nxclass = (char *) (*env)->GetStringUTFChars(env,nxclass,0);    
     Nxurl = (char *) (*env)->GetStringUTFChars(env,nxurl,0);    
-    status = NXlinkexternal(nxhandle,Name,Nxclass,Nxurl);
+    iRet = NXlinkexternal(nxhandle,Name,Nxclass,Nxurl);
     
     /* release strings */
@@ -1228 +1290 @@
     (*env)->ReleaseStringUTFChars(env,nxclass, Nxclass);
     (*env)->ReleaseStringUTFChars(env,nxurl, Nxurl);
+
+    if (iRet != NX_OK) {
+      JapiError(env, "NXlinkexternal failed");
+    }
 }
 /*------------------------------------------------------------------------*/
@@ -1258 +1324 @@
       (*env)->SetObjectArrayElement(env,jnames,0,(jobject)rstring);
     }
+    return status;
 }
 /*---------------------------------------------------------------------*/
@@ -1272 +1339 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 
-    iRet = NXinitattrdir(nxhandle);
-
+    if (NXinitattrdir(nxhandle) != NX_OK) {
+      JapiError(env, "NXinitattrdir failed");
+    }
 }
 /*---------------------------------------------------------------------*/
@@ -1288 +1356 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 
-    iRet = NXinitgroupdir(nxhandle);
+    if (NXinitgroupdir(nxhandle) != NX_OK) {
+      JapiError(env, "NXinitgroupdir failed");
+    }
 }
 /*------------------------------------------------------------------------