Reverting to 2 changes which slipped in at r1324989 (WIP...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1324995 13f79535-47bb-0310-9956-ffa450edef68

framework/entity/src/org/ofbiz/entity/GenericEntity.java

@@ -461,7 +461,7 @@ public void setString(String name, String value) {
         }
 
         boolean isNullString = false;
-        if ("null".equals(value) || "[null-field]".equals(value)) { // keep [null-field] here but not sure it' used now
+        if ("null".equals(value) || "[null-field]".equals(value)) {
             // count this as a null too, but only for numbers and stuff, not for Strings
             isNullString = true;
         }
@@ -1079,12 +1079,7 @@ public Element makeXmlElement(Document document, String prefix) {
                     element.setAttribute(name, value);
                 }
             } else {
-                element.setAttribute(name, "null");
-                element.setAttribute("xsi:nil", "true");
-                // I tried to put the schema in the envelope header (in createAndSendSOAPResponse)
-                // resEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", null);
-                // But it gets prefixed and that does not work. So adding in each instance
-                element.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");                
+                element.setAttribute(name, GenericEntity.NULL_FIELD.toString());
             }
         }