[Jboss-svn-commits] JBL Code SVN: r4522 - in labs/shotoku/trunk: shotoku-feeds/src/java/org/jboss/shotoku/feeds shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools shotoku-file-access/src/java/org/jboss/shotoku/fileaccess

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

Author: adamw
Date: 2006-05-31 10:37:46 -0400 (Wed, 31 May 2006)
New Revision: 4522

Modified:
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/TextEscaping.java
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-85
Some other fixes


Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java	2006-05-31 14:37:30 UTC (rev 4521)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java	2006-05-31 14:37:46 UTC (rev 4522)
@@ -30,8 +30,8 @@
     }
 
     public void update(Pair<String, String> key, FeedsDescriptor currentObject) {
-        //put(key, getDesc(key.getFirst(), key.getSecond()));
-        //currentObject.release();
+        put(key, getDesc(key.getFirst(), key.getSecond()));
+        currentObject.release();
     }
 
     public FeedsDescriptor init(Pair<String, String> key) {

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/TextEscaping.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/TextEscaping.java	2006-05-31 14:37:30 UTC (rev 4521)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/TextEscaping.java	2006-05-31 14:37:46 UTC (rev 4522)
@@ -52,7 +52,7 @@
 	 * commonly seen in building query strings. (In JSTL, the c:url tag performs
 	 * this task automatically.)
 	 */
-	public static String tags(String aTagFragment) {
+	public static String all(String aTagFragment) {
 		if (aTagFragment == null)
 			return null;
 		
@@ -103,7 +103,7 @@
 	 * database. This occurs because the ampersand is the only escaped character
 	 * which appears in a character entity.
 	 */
-	public static String all(String aText) {
+	public static String tags(String aText) {
 		if (aText == null)
 			return null;
 		

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-05-31 14:37:30 UTC (rev 4521)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-05-31 14:37:46 UTC (rev 4522)
@@ -104,15 +104,12 @@
             // Transferring the bytes
             try {
                 Tools.transfer(ci.getIs(), os);
-            } catch (Exception e2) {
-                // Nothing that we can really do. Just send an incomplete
-                // file.
             } finally {
                 os.close();
                 ci.getIs().close();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("Unable to send a file.", e);
             writeErrorMessage(response);
         }
     }