You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/02/02 01:50:33 UTC
svn commit: r1239426 - in /activemq/activemq-apollo/trunk:
apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java
pom.xml
Author: chirino
Date: Thu Feb 2 00:50:33 2012
New Revision: 1239426
URL: http://svn.apache.org/viewvc?rev=1239426&view=rev
Log:
Update jackson version.
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java?rev=1239426&r1=1239425&r2=1239426&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ApolloTypeIdResolver.java Thu Feb 2 00:50:33 2012
@@ -64,9 +64,13 @@ public class ApolloTypeIdResolver implem
}
public String idFromValue(Object value) {
- String rc = typeToId.get(value.getClass());
+ return idFromValueAndType(value, value.getClass());
+ }
+
+ public String idFromValueAndType(Object value, Class<?> aClass) {
+ String rc = typeToId.get(aClass);
if(rc==null)
- throw new IllegalArgumentException("Invalid sub type: "+value.getClass()+", of base type: "+baseType.getRawClass());
+ throw new IllegalArgumentException("Invalid sub type: "+aClass+", of base type: "+baseType.getRawClass());
return rc;
}
Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1239426&r1=1239425&r2=1239426&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Thu Feb 2 00:50:33 2012
@@ -112,7 +112,7 @@
<scalamd-version>1.5</scalamd-version>
<servlet-api-version>2.5</servlet-api-version>
- <jackson-version>1.7.5</jackson-version>
+ <jackson-version>1.9.2</jackson-version>
<logback-version>0.9.24</logback-version>
<jersey-version>1.5</jersey-version>
<snakeyaml-version>1.7</snakeyaml-version>