MonetDB: Dec2011 - Control: only try old protocol when MCL panic...

[Fabian Groffen]

Changeset: 7b225f083bb6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b225f083bb6
Modified Files:
        java/src/nl/cwi/monetdb/merovingian/Control.java
Branch: Dec2011
Log Message:

Control: only try old protocol when MCL panics (can't read blockmode block 
length)


diffs (23 lines):

diff --git a/java/src/nl/cwi/monetdb/merovingian/Control.java 
b/java/src/nl/cwi/monetdb/merovingian/Control.java
--- a/java/src/nl/cwi/monetdb/merovingian/Control.java
+++ b/java/src/nl/cwi/monetdb/merovingian/Control.java
@@ -135,6 +135,10 @@ public class Control {
                        ms.connect(host, port, "monetdb", passphrase);
                        min = ms.getReader();
                        mout = ms.getWriter();
+               } catch (MCLParseException e) {
+                       throw new MerovingianException(e.getMessage());
+               } catch (MCLException e) {
+                       throw new MerovingianException(e.getMessage());
                } catch (AssertionError e) { // mcl panics
                        ms.close();
                        
@@ -212,7 +216,7 @@ public class Control {
                        throw new MerovingianException(e.getMessage());
                }
 
-               mout.writeLine(database + " " + command +"\n");
+               mout.writeLine(database + " " + command + "\n");
                ArrayList<String> l = new ArrayList<String>();
                String tmpLine = min.readLine();
                int linetype = min.getLineType();
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list