You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/10/21 13:24:31 UTC
svn commit: r586885 - in /struts/sandbox/trunk/struts2-rest-plugin:
showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java
src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
Author: mrdon
Date: Sun Oct 21 04:24:30 2007
New Revision: 586885
URL: http://svn.apache.org/viewvc?rev=586885&view=rev
Log:
Tweaks to ensure nothign is returned when it doesn't need to be
Modified:
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
Modified: struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java?rev=586885&r1=586884&r2=586885&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrdersResource.java Sun Oct 21 04:24:30 2007
@@ -46,11 +46,13 @@
public String destroy() {
orders.remove(model.getId());
+ model = null;
return "success";
}
public RestInfo create() {
orders.put(model.getId(), model);
+ model = null;
return new DefaultRestInfo()
.setLocationId(model.getId())
.renderResult("success");
@@ -58,6 +60,7 @@
public String update() {
orders.put(model.getId(), model);
+ model = null;
return "success";
}
Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java?rev=586885&r1=586884&r2=586885&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java Sun Oct 21 04:24:30 2007
@@ -29,8 +29,10 @@
public class XStreamHandler implements ContentTypeHandler {
public String fromObject(Object obj, String resultCode, OutputStream out) throws IOException {
- XStream xstream = createXStream();
- xstream.toXML(obj, out);
+ if (obj != null) {
+ XStream xstream = createXStream();
+ xstream.toXML(obj, out);
+ }
return null;
}