You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/02/18 11:30:14 UTC
svn commit: r1245901 -
/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Author: cschneider
Date: Sat Feb 18 10:30:14 2012
New Revision: 1245901
URL: http://svn.apache.org/viewvc?rev=1245901&view=rev
Log:
Adding ungetTarget to free the service
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java?rev=1245901&r1=1245900&r2=1245901&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java Sat Feb 18 10:30:14 2012
@@ -96,17 +96,20 @@ public class CommandsCompleter implement
}
protected Function unProxy(Function function) {
- if (function instanceof CommandProxy) {
- CommandProxy proxy = (CommandProxy) function;
- Object target = proxy.getTarget();
- if (target instanceof Function) {
- return (Function) target;
- } else {
- return function;
- }
- } else {
- return function;
- }
+ if (function instanceof CommandProxy) {
+ CommandProxy proxy = (CommandProxy) function;
+ Object target = proxy.getTarget();
+ Function result;
+ if (target instanceof Function) {
+ result = (Function) target;
+ } else {
+ result = function;
+ }
+ proxy.ungetTarget();
+ return result;
+ } else {
+ return function;
+ }
}
}