From 3a4a9886f829594d64b0ccb89813c684f406325d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:09 -0400
Subject: [PATCH] Clear instantiated commands and dispatchers from the dispatcher on destroy()

---
 src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
index 38fbd2c..896391f 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
@@ -17,7 +17,8 @@
 
 import java.util.List;
 
-import ro.fortsoft.pf4j.PluginWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.gitblit.manager.IGitblit;
 import com.gitblit.models.UserModel;
@@ -32,6 +33,8 @@
  */
 public class RootDispatcher extends DispatchCommand {
 
+	private Logger log = LoggerFactory.getLogger(getClass());
+
 	public RootDispatcher(IGitblit gitblit, SshDaemonClient client, String cmdLine) {
 		super();
 		setContext(new SshCommandContext(gitblit, client, cmdLine));
@@ -40,13 +43,13 @@
 		registerDispatcher(user, GitblitDispatcher.class);
 		registerDispatcher(user, GitDispatcher.class);
 
-		List<SshCommand> exts = gitblit.getExtensions(SshCommand.class);
-		for (SshCommand sshCommand : exts) {
-			PluginDispatchCommand pluginCmd = new PluginDispatchCommand();
-			PluginWrapper wrapper = gitblit.whichPlugin(sshCommand.getClass());
-			pluginCmd.registerCommand(user, sshCommand.getClass());
-			// TODO(davido): add dispatcher registration per plugin name
-			//registerDispatcher(wrapper.getDescriptor().getPluginId(), pluginCmd);
+		List<DispatchCommand> exts = gitblit.getExtensions(DispatchCommand.class);
+		for (DispatchCommand ext : exts) {
+			Class<? extends DispatchCommand> extClass = ext.getClass();
+			String plugin = gitblit.whichPlugin(extClass).getDescriptor().getPluginId();
+			CommandMetaData meta = extClass.getAnnotation(CommandMetaData.class);
+			log.info("Dispatcher {} is loaded from plugin {}", meta.name(), plugin);
+			registerDispatcher(user, ext);
 		}
 	}
 

--
Gitblit v1.9.1