jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1176578 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java
Date Tue, 27 Sep 2011 19:57:56 GMT
Author: jukka
Date: Tue Sep 27 19:57:56 2011
New Revision: 1176578

URL: http://svn.apache.org/viewvc?rev=1176578&view=rev
Log:
2.2: Merged revision 1175988 (JCR-3063)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 27 19:57:56 2011
@@ -3,4 +3,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112
 8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1176423,1176465,1176515,1176546
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112
 8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java?rev=1176578&r1=1176577&r2=1176578&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NPEandCMETest.java
Tue Sep 27 19:57:56 2011
@@ -27,9 +27,15 @@ import javax.jcr.Session;
 
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
 import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NPEandCMETest extends AbstractJCRTest {
 
+    /** Logger instance */
+    private static final Logger log =
+            LoggerFactory.getLogger(NPEandCMETest.class);
+
     private final static int NUM_THREADS = 10;
     private final static boolean SHOW_STACKTRACE = true;
     
@@ -71,8 +77,8 @@ public class NPEandCMETest extends Abstr
             npes += tasks[i].npes;
             cmes += tasks[i].cmes;
         }
-        System.err.println("Total NPEs: " + npes);
-        System.err.println("Total CMEs: " + cmes);
+        assertEquals("Total NPEs > 0", 0, npes);
+        assertEquals("Total CMEs > 0", 0, cmes);
     }
     
     private static class TestTask implements Runnable {
@@ -121,24 +127,18 @@ public class NPEandCMETest extends Abstr
                 // ignorable
             }
             catch (RepositoryException e) {
-                if (e.getCause() == null || !(e.getCause() instanceof NoSuchItemStateException))
{
-                    System.err.println("thread" + id + ":" + e);
-                    e.printStackTrace();
+                Throwable cause = e.getCause();
+                if (!(cause instanceof NoSuchItemStateException)) {
+                    log.warn("Unexpected RepositoryException caught", e);
                 }
                 // else ignorable
             }
             catch (NullPointerException e) {
-                System.err.println("====> " + e);
-                if (SHOW_STACKTRACE) {
-                    e.printStackTrace();
-                }
+                log.error("NPE caught", e);
                 npes++;
             }
             catch (ConcurrentModificationException e) {
-                System.err.println("====> " + e);
-                if (SHOW_STACKTRACE) {
-                    e.printStackTrace();
-                }
+                log.error("CME caught", e);
                 cmes++;
             }
         }



Mime
View raw message