Author: gnodet
Date: Thu May  7 12:52:16 2009
New Revision: 772639

URL: http://svn.apache.org/viewvc?rev=772639&view=rev
Log:
Add some synchronization to make sure we don't loose commands

Modified:
    
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
    
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java

Modified: 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java?rev=772639&r1=772638&r2=772639&view=diff
==============================================================================
--- 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
 (original)
+++ 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
 Thu May  7 12:52:16 2009
@@ -34,11 +34,11 @@
         this.aliasRegistry = aliasRegistry;
     }
 
-    public void register(final Alias alias, Map<String, ?> properties) throws 
Exception {
+    public synchronized void register(final Alias alias, Map<String, ?> 
properties) throws Exception {
         aliasRegistry.registerAlias(alias.getName(), alias.getAlias());
     }
 
-    public void unregister(final Alias alias, Map<String, ?> properties) 
throws Exception {
+    public synchronized void unregister(final Alias alias, Map<String, ?> 
properties) throws Exception {
         aliasRegistry.removeAlias(alias.getName());
     }
 

Modified: 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java?rev=772639&r1=772638&r2=772639&view=diff
==============================================================================
--- 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
 (original)
+++ 
felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
 Thu May  7 12:52:16 2009
@@ -37,21 +37,21 @@
         this.commandRegistry = commandRegistry;
     }
 
-    public void register(final Command command, Map<String, ?> properties) 
throws Exception {
+    public synchronized void register(final Command command, Map<String, ?> 
properties) throws Exception {
         commandRegistry.registerCommand(command);
     }
 
-    public void unregister(final Command command, Map<String, ?> properties) 
throws Exception {
+    public synchronized void unregister(final Command command, Map<String, ?> 
properties) throws Exception {
         commandRegistry.removeCommand(command);
     }
 
-    public void register(final Link link, Map<String, ?> properties) throws 
Exception {
+    public synchronized void register(final Link link, Map<String, ?> 
properties) throws Exception {
         LinkCommand cmd = new LinkCommand(commandRegistry, link.getTarget());
         cmd.setLocation(new CommandLocationImpl(link.getName()));
         commandRegistry.registerCommand(cmd);
     }
 
-    public void unregister(final Link link, Map<String, ?> properties) throws 
Exception {
+    public synchronized void unregister(final Link link, Map<String, ?> 
properties) throws Exception {
         
commandRegistry.removeCommand(commandRegistry.getCommand(link.getName()));
     }
 


Reply via email to