? .project
? README.in
? src/jni/org_libvirt_Connect.h
? src/jni/org_libvirt_Domain.h
? src/jni/org_libvirt_Domain_CreateFlags.h
? src/jni/org_libvirt_Domain_MigrateFlags.h
? src/jni/org_libvirt_Domain_XMLFlags.h
? src/jni/org_libvirt_Network.h
Index: src/jni/org_libvirt_Connect.c
===================================================================
RCS file: /data/cvs/libvirt-java/src/jni/org_libvirt_Connect.c,v
retrieving revision 1.1
diff -u -p -r1.1 org_libvirt_Connect.c
--- src/jni/org_libvirt_Connect.c	18 Jul 2008 14:37:21 -0000	1.1
+++ src/jni/org_libvirt_Connect.c	21 Jul 2008 18:48:22 -0000
@@ -149,14 +149,13 @@ JNIEXPORT jlong JNICALL Java_org_libvirt
   (JNIEnv *env, jobject obj, jstring uri){
 
 	virConnectPtr vc;
-	virError error;
 
 	//Initialize the libvirt VirtConn Object
 	vc=virConnectOpen((*env)->GetStringUTFChars(env, uri, NULL));
 	if(vc==NULL){
-		virCopyLastError(&error);
-		virErrorHandler(env, &error);
-		return (jlong)NULL;
+		//We have a pending java exception, let's return
+		assert((*env)->ExceptionOccurred(env));
+		return NULL;
 	}
 
 	//Initialized the error handler for this connection
@@ -169,14 +168,13 @@ JNIEXPORT jlong JNICALL Java_org_libvirt
   (JNIEnv *env, jobject obj, jstring uri){
 
 	virConnectPtr vc;
-	virError error;
 
 	//Initialize the libvirt VirtConn Object
 	vc=virConnectOpenReadOnly((*env)->GetStringUTFChars(env, uri, NULL));
 	if(vc==NULL){
-		virCopyLastError(&error);
-		virErrorHandler(env, &error);
-		return (jlong)NULL;
+		//We have a pending java exception, let's return
+		assert((*env)->ExceptionOccurred(env));
+		return NULL;
 	}
 
 	//Initialized the error handler for this connection
@@ -237,10 +235,9 @@ fprintf(stderr, "calling virConnectOpenA
 	if(vc==NULL){
 
 fprintf(stderr, "Got NULL\n");
-
-		virCopyLastError(&error);
-		virErrorHandler(env, &error);
-		return (jlong)NULL;
+		//We have a pending java exception, let's return
+		assert((*env)->ExceptionOccurred(env));
+		return NULL;
 	}
 
 	//Initialize the error handler for this connection