[Jboss-svn-commits] JBL Code SVN: r1589 - in trunk/forge/portal-extensions: forge-feeds/src/java/org/jboss/forge/feeds forge-service/src/java/org/jboss/forge/service

[<jbo...@li...>]

Author: adamw
Date: 2005-11-18 11:28:49 -0500 (Fri, 18 Nov 2005)
New Revision: 1589

Modified:
   trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java
   trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FileBasedFeed.java
   trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
Log:
Stream closing in finally { }, small corrections.


Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java	2005-11-17 22:50:57 UTC (rev 1588)
+++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java	2005-11-18 16:28:49 UTC (rev 1589)
@@ -373,6 +373,7 @@
 			vc.put("dateFormat", new SimpleDateFormat(
 					dateFormat == null ? "MM/dd/yy" : dateFormat));
 			vc.put("now", Calendar.getInstance().getTime());
+			vc.put("baseServerAddress", baseServerAddress);
 
 			for (String project : projects) {
 				String feedNameReplaced = feedName.replace(PROJECT_PARAM,
@@ -473,7 +474,7 @@
 						newFeed.generate(new URL(address));
 						addFeed(feedNameReplaced, type, newFeed);
 					} catch (Exception e) {
-						log.warn("Can't add feeed " + address + " : " + type
+						log.debug("Can't add feeed " + address + " : " + type
 								+ ".", e);
 					}
 				}

Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FileBasedFeed.java
===================================================================
--- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FileBasedFeed.java	2005-11-17 22:50:57 UTC (rev 1588)
+++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FileBasedFeed.java	2005-11-18 16:28:49 UTC (rev 1589)
@@ -53,26 +53,42 @@
 	}
 	
 	public void generate(URL url) throws IOException {
-		InputStream is = url.openStream();
-		generate(is);
-		is.close();
+		InputStream is = null;
+		
+		try {
+			is = url.openStream();
+			generate(is);
+		} finally {
+			if (is != null) {
+				is.close();
+			}
+		}
 	}
 	
 	public void generate(InputStream is) throws IOException {
-		file.createNewFile();
+		OutputStream os = null;
 		
-		OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
-		
-		transfer(is, os);
-			
-		os.close();
+		try {
+			file.createNewFile();
+			os = new BufferedOutputStream(new FileOutputStream(file));
+			transfer(is, os);
+		} finally {	
+			if (os != null) {
+				os.close();
+			}
+		}
 	}
 	
 	public void write(OutputStream os) throws IOException {
-		InputStream is = new BufferedInputStream(new FileInputStream(file));
-		
-		transfer(is, os);
-		is.close();
+		InputStream is = null;
+		try {
+			is = new BufferedInputStream(new FileInputStream(file));		
+			transfer(is, os);
+		} finally {
+			if (is != null) {
+				is.close();
+			}
+		}
 	}
 	
 	public Writer getWriter() throws IOException {

Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java
===================================================================
--- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java	2005-11-17 22:50:57 UTC (rev 1588)
+++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java	2005-11-18 16:28:49 UTC (rev 1589)
@@ -94,11 +94,17 @@
 		if (nw == null) return null;
 		
 		Object currentValue = getFromCache(ck);
-		Object newValue = nw.nodeUpdate(ck.getPortalName(), 
-				currentValue);
-		if (newValue != null)
-			putToCache(ck, newValue);
 		
+		Object newValue = null;
+		try {
+			newValue = nw.nodeUpdate(ck.getPortalName(), 
+					currentValue);
+			if (newValue != null)
+				putToCache(ck, newValue);
+		} catch (Exception e) {
+			// In case of an error, doing nothing.
+		}
+		
 		return newValue == null ? currentValue : newValue;
 	}