Filter null or zero length events

ogdl.jardesc

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ogdl/ogdl.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/ogdl/ogdl.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <jar path="ogdl-java/ogdl.jar"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/ogdl-java/ogdl.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
     <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
@@ -11,6 +11,6 @@
         </sealing>
     </manifest>
     <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
-        <javaElement handleIdentifier="=ogdl/src"/>
+        <javaElement handleIdentifier="=ogdl-java/src"/>
     </selectedElements>
 </jardesc>

src/ogdl/Graph.java

@@ -49,6 +49,10 @@ public class Graph implements IGraph
 	public static final String _OBJ = Types.OBJECT;
 
 	public Graph() {
+		/* Warning: _NULL cannot be a zero length string unless EventHandlerGraph.event() is
+		 * modified. Events with null length are currently ignored, and also not written to
+		 * OGDL binary (see OgdlBinarryEmitter).
+		 */
 		this.name = _NULL;
 	}
 

src/ogdl/OgdlBinaryEmitter.java

@@ -27,6 +27,9 @@ public static void write(IGraph g, OutputStream out) throws IOException
     	final byte[] h = { 1, 'G', 0 };
     	out_write(bout,h);
 
+    	/* This filtering of _NULL should not be necessary, but
+    	 * currently is needed at the reception side.
+    	 */
     	if (! g.getName().equals(Graph._NULL))
     		_writeBinary(0,g,bout);
     	else
@@ -47,6 +50,9 @@ public static byte[] write(IGraph g) throws IOException
     	final byte[] h = { 1, 'G', 0 };
     	out_write(bout,h);
 
+       	/* This filtering of _NULL should not be necessary, but
+    	 * currently is needed at the reception side.
+    	 */
     	if (! g.getName().equals(Graph._NULL))
     		_writeBinary(0,g,bout);
     	else
@@ -80,6 +86,10 @@ private static void _writeBinary(int lev, IGraph g, OutputStream out) throws IOE
 
     private static void writeTextNode (int level, String s, OutputStream out) throws IOException
     {
+    	/* Empty or null strings will not make it */
+    	if (s==null || s.length()==0)
+    		return;
+
        	// write level
     	multiByteInteger(level+1,out); 	
     	// write text

src/ogdl/support/EventHandlerGraph.java

@@ -51,6 +51,9 @@ public void clear()
 
 	public void event(String s) 
 	{
+		//if (s == null || s.length() == 0)
+			//return;
+
 //System.out.println("event: "+s);       
 		if (level>200) { 
 			System.out.println("EventHandlerGraph: ! level=200 at "+s);

src/ogdl/template/Servlets.java

@@ -20,7 +20,7 @@
 import org.apache.commons.fileupload.servlet.*;
 import org.apache.commons.fileupload.disk.*;
 
-import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
+//import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
 
 import java.util.TreeMap;
 import java.util.Set;
@@ -128,6 +128,7 @@ else if (uri.endsWith(RELOAD_URL))
 		/* Jetty and Apache don't return anything with getRemoteUser */
 
 		String u = req.getRemoteUser();
+
 		if (u == null) {
 			/* try authentication header */
 			u = req.getHeader("authorization");