Mailing-List: contact commits-help@river.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@river.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1585683 - in
 /river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini:
 qa/harness/MasterHarness.java
 test/impl/servicediscovery/event/ReRegisterGoodEquals.java
Date: Tue, 08 Apr 2014 10:44:05 -0000
To: commits@river.apache.org
From: peter_firmstone@apache.org
Message-Id: <20140408104405.9049123889EC@eris.apache.org>

Author: peter_firmstone
Date: Tue Apr  8 10:44:05 2014
New Revision: 1585683

URL: http://svn.apache.org/r1585683
Log:
Ensure visibility of outStream in MasterHarness and make fields final than can be.

Make testServiceType volatile in ReRegisterGoodEquals

Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MasterHarness.java
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/event/ReRegisterGoodEquals.java

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MasterHarness.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MasterHarness.java?rev=1585683&r1=1585682&r2=1585683&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MasterHarness.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/MasterHarness.java Tue Apr  8 10:44:05 2014
@@ -131,7 +131,7 @@ class MasterHarness {
     public final static int KEEPALIVE_PORT=10004;
 
     /** the output stream for this VM's output */
-    private PrintStream outStream = System.out;
+    private volatile PrintStream outStream = System.out;
 
     /** the pipe for collecting stderr output from the test vm */
     private Pipe errPipe; 
@@ -143,7 +143,7 @@ class MasterHarness {
     private final static int MAXTESTCOUNT = 100;
 
     /** the command line arguments */
-    private String[] args;
+    private final String[] args;
 
     /** the list of test categories to run. If null, all categories are run. */
     private List categories;
@@ -158,7 +158,7 @@ class MasterHarness {
     private InputForwarder forwarder;
 
     /** the set of tests to run */
-    private TestList testList;
+    private final TestList testList;
 
     /** the list of categories to exclude from testing */
     private List xCategories;
@@ -167,7 +167,7 @@ class MasterHarness {
     private List xTestNames;
 
     /** the configuration object for this test run */
-    private QAConfig config = null;
+    private final QAConfig config;
 
     /**
      * boolean controlling whether to read from stdin
@@ -175,7 +175,7 @@ class MasterHarness {
     boolean doInputBind;
 
     /** a reference to the keep-alive thread */
-    private Thread keepaliveThread;
+    private final Thread keepaliveThread;
 
     /** the category map, cached if non-null */
     private HashMap categoryMap = null;
@@ -997,7 +997,7 @@ class MasterHarness {
     private class InputForwarder implements Runnable {
 
         OutputStream out;
-	Object outLock = new Object();
+	final Object outLock = new Object();
 
 	/**
 	 * Set the output stream to forward bytes to.

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/event/ReRegisterGoodEquals.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/event/ReRegisterGoodEquals.java?rev=1585683&r1=1585682&r2=1585683&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/event/ReRegisterGoodEquals.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/event/ReRegisterGoodEquals.java Tue Apr  8 10:44:05 2014
@@ -48,7 +48,7 @@ import com.sun.jini.qa.harness.TestExcep
 public class ReRegisterGoodEquals extends AbstractBaseTest {
 
     protected LookupCache cache;
-    protected int testServiceType;
+    protected volatile int testServiceType;
 
     protected int nAddedExpected   = 0;
     protected int nRemovedExpected = 0;