svn commit: r986843 - /sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java

[justin]

Author: justin
Date: Wed Aug 18 18:32:15 2010
New Revision: 986843

URL: http://svn.apache.org/viewvc?rev=986843&view=rev
Log:
SLING-1560 - handling IllegalStateException in findConfiguration(); adding 
extra logging in event waiting

Modified:
    
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java

Modified: 
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java?rev=986843&r1=986842&r2=986843&view=diff
==============================================================================
--- 
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
 (original)
+++ 
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
 Wed Aug 18 18:32:15 2010
@@ -180,9 +180,11 @@ class OsgiInstallerTestBase implements F
                final Configuration[] cfgs = ca.listConfigurations(null);
                if (cfgs != null) {
                        for(Configuration cfg : cfgs) {
-                               if(cfg.getPid().equals(pid)) {
-                                       return cfg;
-                               }
+                           try {
+                               if(cfg.getPid().equals(pid)) {
+                                       return cfg;
+                               }
+                           } catch (IllegalStateException e) {}
                        }
                }
        }
@@ -439,7 +441,7 @@ class OsgiInstallerTestBase implements F
         }
     }
 
-    private final static class BundleEventListener implements 
SynchronousBundleListener {
+    private final class BundleEventListener implements 
SynchronousBundleListener {
 
         private final List<BundleEvent> events = new ArrayList<BundleEvent>();
 
@@ -449,13 +451,15 @@ class OsgiInstallerTestBase implements F
             }
         }
 
-        public void wait(final String msg, final BundleEvent[] checkEvents, 
final long timeout)
+        public void wait(final String msg, final BundleEvent[] checkEvents, 
final long timeoutMsec)
         throws Exception {
             if ( checkEvents == null || checkEvents.length == 0 ) {
                 return;
             }
-            final long endTime = System.currentTimeMillis() + timeout;
-            while ( System.currentTimeMillis() < endTime ) {
+            final long start = System.currentTimeMillis();
+            final long end = start + timeoutMsec;
+            log(LogService.LOG_DEBUG, "Starting event check at " + start + "; 
ending by " + end);
+            while ( System.currentTimeMillis() < end ) {
                 synchronized ( this) {
                     if ( this.events.size() >= checkEvents.length ) {
                         int found = 0;
@@ -482,6 +486,7 @@ class OsgiInstallerTestBase implements F
                         }
                     }
                 }
+                log(LogService.LOG_DEBUG, "Event check failed at " + 
System.currentTimeMillis() + "; sleeping");
                 try {
                     Thread.sleep(100);
                 } catch (InterruptedException ignore) {}