From 033d7bf0f314ce5c4aca18d7e4abf9e0bf5bef54 Mon Sep 17 00:00:00 2001
From: Wolf Posdorfer <mordredd666@gmail.com>
Date: Wed, 30 Mar 2011 13:57:40 +0000
Subject: [PATCH] fixed nullpointer in StringUtils fixed restarter on Ubuntu
 spark.file is in spark_home/bin/ not in spark_home/

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12218 b35dd754-fafc-0310-a699-88a17e54d16e
---
 src/java/org/jivesoftware/MainWindow.java        | 16 ++++++++++++++++
 .../org/jivesoftware/spark/util/StringUtils.java |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/java/org/jivesoftware/MainWindow.java b/src/java/org/jivesoftware/MainWindow.java
index d4fff958..0f90c3fa 100644
--- a/src/java/org/jivesoftware/MainWindow.java
+++ b/src/java/org/jivesoftware/MainWindow.java
@@ -349,7 +349,23 @@ public final class MainWindow extends ChatFrame implements ActionListener {
                 command = starterExe + " \"" + sparkExe + "\"";
             }
             else if (Spark.isLinux()) {
+        	File f =  Spark.getBinDirectory().getParentFile() ;
+        	String[] list = f.list();
+        	boolean contains =false;
+        	for(String s : list)
+        	{
+        	    if (s.equals("spark"))
+        	    {
+        		contains=true;
+        		return;
+        	    }
+        	}
+        	if(contains){
             	command = Spark.getBinDirectory().getParentFile().getCanonicalPath() + File.separator + "spark";
+        	}
+        	else{
+        	    command = Spark.getBinDirectory().getCanonicalPath() + File.separator + "spark";  
+        	}
             }
             else if (Spark.isMac()) {
                 command = "open -a Spark";
diff --git a/src/java/org/jivesoftware/spark/util/StringUtils.java b/src/java/org/jivesoftware/spark/util/StringUtils.java
index fc64886d..69a03603 100644
--- a/src/java/org/jivesoftware/spark/util/StringUtils.java
+++ b/src/java/org/jivesoftware/spark/util/StringUtils.java
@@ -1944,7 +1944,9 @@ public class StringUtils {
      * @author wolf.posdorfer
      */
     public static String modifyWildcards(String resource) {
-
+	if(resource==null)
+	    return "";
+	
 	resource = resource.replace("%random%",
 		"" + Math.round((Math.random() * 1000)));