Author: lryan
Date: Wed Mar 18 22:16:30 2009
New Revision: 755755
URL: http://svn.apache.org/viewvc?rev=755755&view=rev
Log:
Fixed again but this time without the test failure
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=755755&r1=755754&r2=755755&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
Wed Mar 18 22:16:30 2009
@@ -102,7 +102,7 @@
}
public <T> T convertToObject(String string, Class<T> clazz) {
- return clazz.cast(convertToObject(string, (Type) clazz));
+ return (T)convertToObject(string, (Type) clazz);
}
public String convertToString(Object pojo) {
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java?rev=755755&r1=755754&r2=755755&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Wed Mar 18 22:16:30 2009
@@ -73,7 +73,7 @@
context.addServlet(defaultHolder, "/");
context.addEventListener(new GuiceServletContextListener());
-
+
Map<String, String> initParams = Maps.newHashMap();
String modules = Join
.join(":", SampleModule.class.getName(),
DefaultGuiceModule.class.getName(),
