sync

mcculls · Jan 10, 2011 · 5c671dd · 5c671dd
1 parent 8a9ad04
commit 5c671dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/...12/paint-example-ip/org.foo.windowlistener/src/org/foo/windowlistener/WindowListener.java b/...12/paint-example-ip/org.foo.windowlistener/src/org/foo/windowlistener/WindowListener.java
@@ -62,6 +62,7 @@ public void windowClosed(WindowEvent evt) {
       m_log.log( LogService.LOG_INFO, "Window closed" );
       m_context.getBundle(0).stop();
     } catch (BundleException e) {
+    } catch (IllegalStateException e) {
     }
   }  
 }
diff --git a/...paint-example-mixed/org.foo.windowlistener/src/org/foo/windowlistener/WindowListener.java b/...paint-example-mixed/org.foo.windowlistener/src/org/foo/windowlistener/WindowListener.java
@@ -62,6 +62,7 @@ public void windowClosed(WindowEvent evt) {
     try {
       m_context.getBundle(0).stop();
     } catch (BundleException e) {
+    } catch (IllegalStateException e) {
     }
   }  
 }
diff --git a/...app/StockWatcher/src/com/google/gwt/sample/stockwatcher/server/StockPriceServiceImpl.java b/...app/StockWatcher/src/com/google/gwt/sample/stockwatcher/server/StockPriceServiceImpl.java
@@ -51,13 +51,14 @@ public StockPrice[] getPrices(String[] symbols) throws DelistedException, Servic
 
   private StockPrice[] readPrices(StockProvider provider, String[] symbols) throws DelistedException {
     StockPrice[] prices = new StockPrice[symbols.length];
-    Map<String, Double> stocks = provider.getStocks(symbols);
 
+    Map<String, Double> stocks = provider.getStocks(symbols);    
+    Map<String, Double> last = updateStockPrices(stocks);
+
     for (int i=0; i<symbols.length; i++) {
       Double newPrice = stocks.get( symbols[i] );
-      Map<String, Double> last = updateStockPrices(stocks);
       if ( newPrice == null ) {
-        throw new DelistedException(symbols[i]);
+        throw new DelistedException(symbols[i]); 
       }
       else {
         Double oldPrice = last.get( symbols[i] );

diff --git a/...org.apache.felix.ipojo-1.7.0-SNAPSHOT.jar → ...e.felix.ipojo-1.7.0-20110108.091842-4.jar b/...org.apache.felix.ipojo-1.7.0-SNAPSHOT.jar → ...e.felix.ipojo-1.7.0-20110108.091842-4.jar