potenial fix for issue introduced by globals support in recent release.

#3
kotowicz · Jan 14, 2014 · cbed92e · cbed92e
1 parent 5505182
commit cbed92e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/ParforProgress2.m b/ParforProgress2.m
@@ -23,7 +23,7 @@
 % delete(ppm);
 %
 %
-% Copyright (c) 2010-2013, Andreas Kotowicz
+% Copyright (c) 2010-2014, Andreas Kotowicz
 
 classdef ParforProgress2 < handle
 

diff --git a/ParforProgressClient2.java b/ParforProgressClient2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013, Andreas Kotowicz
+ * Copyright (c) 2010-2014, Andreas Kotowicz
  *
  *
  * ideas for this code are from:

diff --git a/ParforProgressConsole2.m b/ParforProgressConsole2.m
@@ -3,7 +3,7 @@
 % use ParforProgressStarter() instead.    
 % not using saveobj and loadobj, because old matlab versions have problems
 % with it.
-% Copyright (c) 2010-2013, Andreas Kotowicz
+% Copyright (c) 2010-2014, Andreas Kotowicz
 
     properties (GetAccess = private, SetAccess = private)
         message

diff --git a/ParforProgressServer2.java b/ParforProgressServer2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013, Andreas Kotowicz
+ * Copyright (c) 2010-2014, Andreas Kotowicz
  *
  *
  * ideas for this code are from:

diff --git a/ParforProgressStarter2.m b/ParforProgressStarter2.m
@@ -35,7 +35,7 @@
 %   end
 %
 % 
-% Copyright (c) 2010-2013, Andreas Kotowicz
+% Copyright (c) 2010-2014, Andreas Kotowicz
 %
     %%
 
@@ -97,12 +97,12 @@
     server_class_loaded = exist('ParforProgressServer2', 'class');
 
     if pool_slaves > 0
-        if java_enabled == 1 && ~server_class_loaded
+        if java_enabled == 1 %&& ~server_class_loaded
             pctRunOnAll(['javaaddpath({''' dir_to_add '''})']);
         end
         pctRunOnAll(['addpath(''' dir_to_add ''')']);
     else
-        if java_enabled == 1 && ~server_class_loaded
+        if java_enabled == 1 %&& ~server_class_loaded
             javaaddpath({dir_to_add});
         end
         addpath(dir_to_add);

diff --git a/ParforProgressStressTest2.m b/ParforProgressStressTest2.m
@@ -3,7 +3,7 @@ function ParforProgressStressTest2(N)
 % use this function to determine how many simultaneous connections your
 % computer can handle, and adjust the ppm.increment() call accordingly.
 %
-% Copyright (c) 2010-2013, Andreas Kotowicz
+% Copyright (c) 2010-2014, Andreas Kotowicz
 %
 %%
     if nargin < 1