Changeset 7817 for trunk/legacy/jvmlink

Timestamp:

11/24/11 15:58:03 (8 years ago)

Author:

mario

Message:

added in idea of exception handling between Java and C++ exec methods

Location:

trunk/legacy/jvmlink/src/main

Files:

• c++/JVMLinkClient.cpp (modified) (3 diffs)
• c++/JVMLinkClient.h (modified) (2 diffs)
• java/loci/jvmlink/ConnThread.java (modified) (1 diff)

trunk/legacy/jvmlink/src/main/c++/JVMLinkClient.cpp

@@ -54 +54 @@
 //TODO: clear memory at appropriate points.
 
+JVMException::JVMException(const std::string& aMessage) throw()
+{
+        mMessage = aMessage;
+}
+
+JVMException::~JVMException() throw()
+{
+}
+
+const char* JVMException::what() const throw()
+{
+        return mMessage.c_str();
+}
+
+
 JVMLinkClient::JVMLinkClient(void)
 {
@@ -64 +79 @@
 // -- Public API methods --
 
-void JVMLinkClient::startJava(int arg_port, const std::string& classpath) {
+void JVMLinkClient::startJava(unsigned short arg_port, const std::string& classpath) {
         port = arg_port == 0 ? DEFAULT_PORT : arg_port;
         std::stringstream tmpportstr;
@@ -235 +250 @@
         sendInt(EXEC_CMD);
         sendMessage(command);
+        int status = readInt();
+        if (status != 0) {
+                std::string vMessage = *readString();
+                JVMException vJVMException(vMessage);
+                throw vJVMException;
+        }
 }
 

trunk/legacy/jvmlink/src/main/c++/JVMLinkClient.h

@@ -42 +42 @@
 //#define debug(msg) std::cout << "JVMLinkClient: " << msg << std::endl
 
+class JVMException : public std::exception
+{
+public:
+        JVMException(const std::string& aMessage) throw ();
+        virtual ~JVMException() throw ();
+
+        virtual const char* what() const throw();
+
+private:
+        std::string mMessage;
+};
+
+
 class JVMLinkClient
 {
 private:
-        int port;
+        unsigned short port;
 #ifdef _WIN32
         SOCKET conn;
@@ -68 +81 @@
 
         JVMLinkClient();
-        void startJava(int, const std::string&);
+        void startJava(unsigned short, const std::string&);
         void shutJava();
         ConnectionCode establishConnection();

trunk/legacy/jvmlink/src/main/java/loci/jvmlink/ConnThread.java

@@ -685 +685 @@
     String cmd = readString();
     debug("exec: " + cmd);
-    r.exec(cmd);
+    try {
+      r.exec(cmd);
+      writeInt(0);
+      out.flush();
+    } catch (ReflectException exc) {
+      writeInt(1);
+      out.flush();
+      writeString(exc.getMessage());
+      out.flush();
+
+      throw exc;
+    }
   }