diff --git a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java index ae7713c50f3..8740322c729 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,7 +102,7 @@ public class LiteralExpression implements Expression { public T getValue(EvaluationContext context, Object rootObject, Class desiredResultType) throws EvaluationException { Object value = getValue(context, rootObject); - return ExpressionUtils.convert(null, value, desiredResultType); + return ExpressionUtils.convert(context, value, desiredResultType); } public Class getValueType(Object rootObject) throws EvaluationException { diff --git a/spring-messaging/activemq-data/localhost/KahaDB/db-1.log b/spring-messaging/activemq-data/localhost/KahaDB/db-1.log new file mode 100644 index 00000000000..0d81b8b851b Binary files /dev/null and b/spring-messaging/activemq-data/localhost/KahaDB/db-1.log differ diff --git a/spring-messaging/activemq-data/localhost/KahaDB/db.data b/spring-messaging/activemq-data/localhost/KahaDB/db.data new file mode 100644 index 00000000000..9679f537bb0 Binary files /dev/null and b/spring-messaging/activemq-data/localhost/KahaDB/db.data differ diff --git a/spring-messaging/activemq-data/localhost/KahaDB/db.redo b/spring-messaging/activemq-data/localhost/KahaDB/db.redo new file mode 100644 index 00000000000..b24b50f3cdc Binary files /dev/null and b/spring-messaging/activemq-data/localhost/KahaDB/db.redo differ