[Wonder-cvs] SF.net SVN: wonder:[10692] trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/ rest

[<ms...@us...>]

Revision: 10692
          http://wonder.svn.sourceforge.net/wonder/?rev=10692&view=rev
Author:   mschrag
Date:     2010-02-25 13:13:03 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
fix for empty POSTs and PUTs -- doesn't result in an NPE anymore

Modified Paths:
--------------
    trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXJSONRestParser.java
    trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXPListRestParser.java
    trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXXmlRestParser.java
    trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/gianduia/ERXGianduiaRestParser.java

Modified: trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXJSONRestParser.java
===================================================================
--- trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXJSONRestParser.java	2010-02-25 01:06:28 UTC (rev 10691)
+++ trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXJSONRestParser.java	2010-02-25 13:13:03 UTC (rev 10692)
@@ -79,6 +79,10 @@
 			JSON rootJSON = JSONSerializer.toJSON(contentStr, ERXJSONRestWriter._config);
 			rootRequestNode = createRequestNodeForJSON(null, rootJSON, true, delegate);
 		}
+		else {
+			rootRequestNode = new ERXRestRequestNode(null, true);
+			rootRequestNode.setNull(true);
+		}
 
 		return rootRequestNode;
 	}

Modified: trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXPListRestParser.java
===================================================================
--- trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXPListRestParser.java	2010-02-25 01:06:28 UTC (rev 10691)
+++ trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXPListRestParser.java	2010-02-25 13:13:03 UTC (rev 10692)
@@ -77,6 +77,10 @@
 			Object rootObj = NSPropertyListSerialization.propertyListFromString(contentStr);
 			rootRequestNode = createRequestNodeForObject(null, rootObj, true, delegate);
 		}
+		else {
+			rootRequestNode = new ERXRestRequestNode(null, true);
+			rootRequestNode.setNull(true);
+		}
 
 		return rootRequestNode;
 	}

Modified: trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXXmlRestParser.java
===================================================================
--- trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXXmlRestParser.java	2010-02-25 01:06:28 UTC (rev 10691)
+++ trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/format/ERXXmlRestParser.java	2010-02-25 13:13:03 UTC (rev 10692)
@@ -104,6 +104,10 @@
 				throw new IllegalArgumentException("Failed to parse request document.", e);
 			}
 		}
+		else {
+			rootRequestNode = new ERXRestRequestNode(null, true);
+			rootRequestNode.setNull(true);
+		}
 
 		return rootRequestNode;
 	}

Modified: trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/gianduia/ERXGianduiaRestParser.java
===================================================================
--- trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/gianduia/ERXGianduiaRestParser.java	2010-02-25 01:06:28 UTC (rev 10691)
+++ trunk/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/gianduia/ERXGianduiaRestParser.java	2010-02-25 13:13:03 UTC (rev 10692)
@@ -43,6 +43,10 @@
 			System.out.println("ERXGianduiaRestParser.parseRestRequest: " + rootJSON);
 			rootRequestNode = ERXJSONRestParser.createRequestNodeForJSON(null, rootJSON, true, delegate);
 		}
+		else {
+			rootRequestNode = new ERXRestRequestNode(null, true);
+			rootRequestNode.setNull(true);
+		}
 
 		return rootRequestNode;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.