Author: gnodet
Date: Tue Sep 21 12:04:27 2010
New Revision: 999364
URL: http://svn.apache.org/viewvc?rev=999364&view=rev
Log:
KARAF-206: The converter used for converting commands arguments and options
can't convert objects to String
Modified:
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
Modified:
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java?rev=999364&r1=999363&r2=999364&view=diff
==============================================================================
---
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
(original)
+++
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
Tue Sep 21 12:04:27 2010
@@ -265,6 +265,9 @@ public class DefaultActionPreparator imp
protected Object convert(Action action, CommandSession session, Object
value, Type toType) throws Exception
{
+ if (toType == String.class) {
+ return value != null ? value.toString() : null;
+ }
return new
DefaultConverter(action.getClass().getClassLoader()).convert(value, toType);
}
Modified:
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java?rev=999364&r1=999363&r2=999364&view=diff
==============================================================================
---
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
(original)
+++
karaf/branches/karaf-2.0.x/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
Tue Sep 21 12:04:27 2010
@@ -84,7 +84,11 @@ public class BlueprintCommand extends Ab
@Override
protected Object convert(Action action, CommandSession commandSession,
Object o, Type type) throws Exception {
- return blueprintConverter.convert(o, new GenericType(type));
+ GenericType t = new GenericType(type);
+ if (t.getRawClass() == String.class) {
+ return o != null ? o.toString() : null;
+ }
+ return blueprintConverter.convert(o, t);
}
@Override
