Nightly build script now removes the build and dist dirs prior to building to force non-stale builds

Callbacks now use volatile hashtables for specificData and callbackInfo
callSocketClosed() will not fire if the currentSocketState is already thought to be closed
Added some error logging to Logging plugin to counter an error that was reported


git-svn-id: http://svn.dmdirc.com/trunk@1922 00569f92-eb28-0410-84fd-f71c24880f

BuildAll.sh

@@ -33,6 +33,9 @@ mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
 awk '{gsub(/int RELEASE_DATE = 0/,"int RELEASE_DATE = '`date +%Y%m%d`'");print}' ${MYDIR}/src/com/dmdirc/Main.java > ${MYDIR}/src/com/dmdirc/Main.java.tmp
 mv ${MYDIR}/src/com/dmdirc/Main.java.tmp ${MYDIR}/src/com/dmdirc/Main.java
 
+# This makes sure we have a clean build with no stale class files, it just takes longer
+rm -Rf $MYDIR/build $MYDIR/dist
+
 $ANT -buildfile $MYDIR/build.xml -k
 if [ -f $MYDIR/dist/DMDirc.jar ]; then
 	FILENAME=DMDirc`date +_%Y%m%d`_${SVNREV}.jar

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -301,6 +301,10 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 				case QUERY_CLOSED:
 					// ActionManager.processEvent(CoreActionType.QUERY_CLOSED, this);
 					query = (Query)arguments[0];
+					if (query.getServer() != null) {
+						Logger.appError(ErrorLevel.MEDIUM, "Query object has no server ("+thisType.toString()+")", new Exception("Query object has no server ("+thisType.toString()+")""));
+						break;
+					}
 					parser = query.getServer().getParser();
 					client = parser.getClientInfo(query.getHost());
 					if (client == null) {
@@ -337,6 +341,10 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 				case QUERY_OPENED:
 					// ActionManager.processEvent(CoreActionType.QUERY_OPENED, this);
 					query = (Query)arguments[0];
+					if (query.getServer() != null) {
+						Logger.appError(ErrorLevel.MEDIUM, "Query object has no server ("+thisType.toString()+")", new Exception("Query object has no server ("+thisType.toString()+")""));
+						break;
+					}
 					parser = query.getServer().getParser();
 					client = parser.getClientInfo(query.getHost());
 					if (client == null) {
@@ -370,6 +378,10 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 				case QUERY_SELF_ACTION:
 					// ActionManager.processEvent(CoreActionType.QUERY_MESSAGE, this, message);
 					query = (Query)arguments[0];
+					if (query.getServer() != null) {
+						Logger.appError(ErrorLevel.MEDIUM, "Query object has no server ("+thisType.toString()+")", new Exception("Query object has no server ("+thisType.toString()+")""));
+						break;
+					}
 					parser = query.getServer().getParser();
 					String overrideNick = "";
 					if (thisType == CoreActionType.QUERY_SELF_MESSAGE || thisType == CoreActionType.QUERY_SELF_ACTION) {

src/com/dmdirc/parser/IRCParser.java

@@ -661,16 +661,20 @@ public final class IRCParser implements Runnable {
 			try {
 				lastLine = in.readLine(); // Blocking :/
 				if (lastLine == null) {
-					currentSocketState = STATE_CLOSED;
-					callSocketClosed();
+					if (currentSocketState != STATE_CLOSED) { 
+						currentSocketState = STATE_CLOSED;
+						callSocketClosed();
+					}
 					reset();
 					break;
 				} else {
 					processLine(lastLine);
 				}
 			} catch (IOException e) {
-				currentSocketState = STATE_CLOSED;
-				callSocketClosed();
+				if (currentSocketState != STATE_CLOSED) { 
+					currentSocketState = STATE_CLOSED;
+					callSocketClosed();
+				}
 				reset();
 				break;
 			}
@@ -1431,8 +1435,10 @@ public final class IRCParser implements Runnable {
 		} catch (Exception e) {
 			/* Do Nothing */
 		} finally {
-			currentSocketState = STATE_CLOSED;
-			callSocketClosed();
+			if (currentSocketState != STATE_CLOSED) { 
+				currentSocketState = STATE_CLOSED;
+				callSocketClosed();
+			}
 			reset();
 		}
 	}

src/com/dmdirc/parser/callbacks/CallbackObject.java

@@ -39,7 +39,7 @@ import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
  */
 public abstract class CallbackObject {
 	/** Arraylist for storing callback information related to the callback. */
-	protected ArrayList<ICallbackInterface> callbackInfo = new ArrayList<ICallbackInterface>();
+	protected volatile ArrayList<ICallbackInterface> callbackInfo = new ArrayList<ICallbackInterface>();
 	
 	/** Reference to the IRCParser that owns this callback. */
 	protected IRCParser myParser;

src/com/dmdirc/parser/callbacks/CallbackObjectSpecific.java

@@ -41,7 +41,7 @@ import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
 public abstract class CallbackObjectSpecific extends CallbackObject {
 	
 	/** Hashtable for storing specific information for callback. */	
-	protected Hashtable<ICallbackInterface, String> specificData = new Hashtable<ICallbackInterface, String>();
+	protected volatile Hashtable<ICallbackInterface, String> specificData = new Hashtable<ICallbackInterface, String>();
 	
 	/**
 	 * Create a new instance of the Callback Object.