Fix the bug of initial setup

For the first time, load() will five null, which would cause the NullPointerException
tsszh · Mar 22, 2016 · c8212ae · c8212ae
1 parent 9f1efcb
commit c8212ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/JenkinsPlugin/src/main/java/jenkins/plugins/slack/SlackBot.java b/JenkinsPlugin/src/main/java/jenkins/plugins/slack/SlackBot.java
@@ -113,6 +113,7 @@ void setSlackBot(String slackToken, String userID) {
 	void connectToSlack(String token) {
 		this.session = SlackSessionFactory.createWebSocketSlackSession(token);
 		this.session.addMessagePostedListener(postedHangdler);
+		logger.info("Connecting to Slack Server ("+token+")...");;
 		try {
 			this.session.connect();
 			logger.info("Connection to SLack: Success - "+token);

diff --git a/JenkinsPlugin/src/main/java/jenkins/plugins/slack/SlackBotServer.java b/JenkinsPlugin/src/main/java/jenkins/plugins/slack/SlackBotServer.java
@@ -42,6 +42,8 @@ public void start() throws Exception {
         bot = new SlackBot(); 				// Create the slackbot
 		(new Thread(bot)).start(); 			// Thread for slack bot server
 		load();								// Loads token & userID of this instance from the persisted storage.
+		if ( this.token == null ) this.token = "";
+		if ( this.userID == null ) this.userID = "";
 		resetSlackBot();
     }
     /**