Merge pull request #787 from wagnert/1.0

Switch from Stackable to array to avoid Windows segfaults
appserver-io · May 6, 2015 · 25bf931 · 25bf931
2 parents 7a858c8 + 58d2876
commit 25bf931
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 1.0.5
+
+## Bugfixes
+
+* Fixed [#784](https://github.com/appserver-io/appserver/issues/784) - Application Deployment after switching to safe user
+
+## Features
+
+* Closed [#758](https://github.com/appserver-io/appserver/issues/758) - Update to latest PHP 5.5.24
+
 # Version 1.0.4
 
 ## Bugfixes

diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 #--------------------------------------------------------------------------------
 
 # ---- Module Release Settings --------------------------------------------------
-release.version = 1.0.4
+release.version = 1.0.5
 release.name = Iron Horse
 
 # ---- PHPCPD Settings ----------------------------------------------------------

diff --git a/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php b/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php
@@ -263,8 +263,11 @@ public function run()
 
         // create a separate queue for each priority
         foreach (PriorityKeys::getAll() as $priorityKey) {
+            // ATTENTION: We use an array for the jobs (threads) that are executing acutually.
+            //            Using stackables leads to random segfaults on Windows!
+            $jobsExecuting[$counter] = array();
+
             // create the containers for the worker
-            $jobsExecuting[$counter] = new GenericStackable();
             $jobsToExceute[$counter] = new GenericStackable();
             $messageStates[$counter] = new GenericStackable();
 

diff --git a/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php b/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php
@@ -127,11 +127,11 @@ public function injectMessageStates(GenericStackable $messageStates)
     /**
      * Inject the storage for the executing jobs.
      *
-     * @param \AppserverIo\Storage\GenericStackable $jobsExecuting The storage for the executing jobs
+     * @param array $jobsExecuting The storage for the executing jobs
      *
      * @return void
      */
-    public function injectJobsExecuting(GenericStackable $jobsExecuting)
+    public function injectJobsExecuting(array $jobsExecuting)
     {
         $this->jobsExecuting = $jobsExecuting;
     }