You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2008/01/30 23:09:57 UTC
svn commit: r616921 -
/felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java
Author: rickhall
Date: Wed Jan 30 14:09:56 2008
New Revision: 616921
URL: http://svn.apache.org/viewvc?rev=616921&view=rev
Log:
Applied patch (FELIX-473) to fix a bug in retrieving a command's service
reference.
Modified:
felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java
Modified: felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java?rev=616921&r1=616920&r2=616921&view=diff
==============================================================================
--- felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java (original)
+++ felix/trunk/shell/src/main/java/org/apache/felix/shell/impl/Activator.java Wed Jan 30 14:09:56 2008
@@ -225,7 +225,18 @@
public synchronized ServiceReference getCommandReference(String name)
{
- return (ServiceReference) m_commandNameMap.get(name);
+ ServiceReference ref = null;
+ Iterator itr = m_commandRefMap.entrySet().iterator();
+ while (itr.hasNext())
+ {
+ Map.Entry entry = (Map.Entry) itr.next();
+ if (((Command) entry.getValue()).getName().equals(name))
+ {
+ ref = (ServiceReference) entry.getKey();
+ break;
+ }
+ }
+ return ref;
}
public synchronized void removeCommand(ServiceReference ref)