Merge branch 'master' of git://github.com/280north/cappuccino

Foundation/CPKeyedUnarchiver.j

@@ -465,7 +465,7 @@ var _CPKeyedUnarchiverDecodeObjectAtIndex = function(self, anIndex)
 
         self._plistObject = savedPlistObject;
 
-        if (processedObject != object)
+        if (processedObject !== object)
         {
             if (self._delegateSelectors & _CPKeyedUnarchiverWillReplaceObjectWithObjectSelector)
                 [self._delegate unarchiver:self willReplaceObject:object withObject:processedObject];
@@ -519,7 +519,7 @@ var _CPKeyedUnarchiverDecodeObjectAtIndex = function(self, anIndex)
 
     // If this object is a member of _CPKeyedArchiverValue, then we know
     // that it is a wrapper for a primitive JavaScript object.
-    if (object.isa === _CPKeyedArchiverValueClass)
+    if (object && (object.isa === _CPKeyedArchiverValueClass))
         object = [object JSObject];
 
     return object;

Objective-J/Executable.js

@@ -280,15 +280,18 @@ function fileExecutableSearchFinished(/*FileExecutable*/ aFileExecutable)
 
 function fileExecutableDependencyLoadFinished()
 {
-    var index = 0,
-        count = fileDependencyExecutables.length;
+    var executables = fileDependencyExecutables,
+        index = 0,
+        count = executables.length;
+
+    fileDependencyExecutables = [];
 
     for (; index < count; ++index)
-        fileDependencyExecutables[index]._fileDependencyStatus = ExecutableLoadedFileDependencies;
+        executables[index]._fileDependencyStatus = ExecutableLoadedFileDependencies;
 
     for (index = 0; index < count; ++index)
     {
-        var executable = fileDependencyExecutables[index],
+        var executable = executables[index],
             callbacks = executable._fileDependencyCallbacks,
             callbackIndex = 0,
             callbackCount = callbacks.length;