Fixing a bug in the server code as well as making the client robust to

properties that may contain non serializable objects

Author: madhephaestus

src/main/java/eu/mihosoft/vrl/v3d/CSG.java

@@ -803,7 +803,7 @@ public CSG optimization(OptType type) {
 	public CSG union(CSG csg) {
 		if (this.polygons.size() > getMinPolygonsForOffloading() || csg.polygons.size() > getMinPolygonsForOffloading())
 			if (CSGClient.isRunning()) {
-				ArrayList<CSG> go = new ArrayList<CSG>(Arrays.asList(this));
+				ArrayList<CSG> go = new ArrayList<CSG>(Arrays.asList(this,csg));
 				try {
 					return CSGClient.getClient().union(go).get(0);
 				} catch (Exception e) {

src/main/java/eu/mihosoft/vrl/v3d/CSGClient.java

@@ -131,6 +131,12 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 			ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
 			System.out.println("Running Operation on server: " + hostname + " " + operation);
 			// Create and send request
+			ArrayList<PropertyStorage> store  =new ArrayList<PropertyStorage>();
+			for(CSG c:csgList) {
+				store.add(c.getStorage());
+				// Do not attempt to send properties because they may contain lambda functions that can not serialize
+				c.setStorage(new PropertyStorage());
+			}
 			CSGRequest request = new CSGRequest(csgList, operation);
 			if (key != null)
 				request.setAPIKEY(key);
@@ -145,6 +151,11 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 				throw new RuntimeException(response.getMessage());
 			// Return results as ArrayList
 			back = new ArrayList<>(response.getCsgList());
+			for(CSG c:back) {
+				for(PropertyStorage s:store) {
+					c.getStorage().syncProperties(s);// Keep the Lambdas in the memory space where they came from
+				}
+			}
 		} catch (Throwable t) {
 			socket.close();
 			throw t;

src/main/java/eu/mihosoft/vrl/v3d/CSGServerHandler.java

@@ -100,7 +100,8 @@ private CSGResponse processCSGRequest(CSGRequest request) {
 					back.add(c.triangulate(true));
 				break;
 			case UNION:
-				back.add(CSG.unionAll(request.getCsgList()));
+				CSG d = request.getCsgList().remove(0);
+				back.add(d.union(request.getCsgList()));
 				break;
 			case minkowskiHullShape:
 				CSG m1 = request.getCsgList().remove(0);