Author: ekoneil
Date: Sun May 8 19:14:02 2005
New Revision: 169222
URL: http://svn.apache.org/viewcvs?rev=169222&view=rev
Log:
Fixes for controls tests related to JIRA 617 and 618.
The only fix here was to adjust the spelling of "false" in
CompositeMThreadControlImpl.jcs which was causing APT to throw an NPE / CCE
depending on the classes involved. Once fixed, the controls build correctly
and neither stack trace from 617 or 618 appears.
Not sure how we want to handle these types of errors in Beehive -- though we
should probably file bugs with Sun on APT as well.
BB: self
DRT: Beehive pass
Added:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs
- copied, changed from r169214,
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs.inactive
Removed:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs.inactive
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/NestedSThreadControlImpl.jcs
Copied:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs
(from r169214,
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs.inactive)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs?p2=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs&p1=incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs.inactive&r1=169214&r2=169222&rev=169222&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs.inactive
(original)
+++
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/CompositeMThreadControlImpl.jcs
Sun May 8 19:14:02 2005
@@ -24,7 +24,7 @@
NestedMThreadControlBean nestedM;
public int startSingleThreadNestedControl(){
- return nestedS.doSlowIncrement(fasle);}
+ return nestedS.doSlowIncrement(false);}
public int stopSingleThreadNestedControl(){
return nestedS.doSlowIncrement(true);}
public int startMultiThreadNestedControl(){
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/NestedSThreadControlImpl.jcs
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/NestedSThreadControlImpl.jcs?rev=169222&r1=169221&r2=169222&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/NestedSThreadControlImpl.jcs
(original)
+++
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/threading/nested/NestedSThreadControlImpl.jcs
Sun May 8 19:14:02 2005
@@ -16,26 +16,22 @@
public class NestedSThreadControlImpl implements NestedSThreadControl,
java.io.Serializable
{
private boolean marker=false;
- private int counter=0;
- /*
- * This line causes a java.lang.ClassCastException:
com.sun.tools.javac.code.Symbol$ClassSymbol
- * private int count=0;
- */
+ private int count=0;
public int doSlowIncrement(boolean isStopper){
if(isStopper){
marker=false;
- return counter;
+ return count;
}
else{
marker=true;
while(marker){
- counter++;
+ count++;
try{Thread.currentThread().sleep(200);}
catch(InterruptedException
e){e.printStackTrace();}
}
- return counter;
+ return count;
}
}
}
