[Yanel-commits] rev 21225 - public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2006-12-28 17:04:20 +0100 (Thu, 28 Dec 2006)
New Revision: 21225

Modified:
   public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java
Log:
aggregation fixed

Modified: public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java	2006-12-28 15:47:21 UTC (rev 21224)
+++ public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java	2006-12-28 16:04:20 UTC (rev 21225)
@@ -52,14 +52,17 @@
             log.error("DEBUG: Child: " + children[i]);
             if (dataRepo.isResource(children[i])) {
                 java.io.InputStream in = dataRepo.getInputStream(children[i]);
-                StringBuffer event = new StringBuffer();
+                java.io.ByteArrayOutputStream baos  = new java.io.ByteArrayOutputStream();
+                //StringBuffer event = new StringBuffer();
             
                 byte[] buffer = new byte[8192];
                 int bytesRead;
                 while ((bytesRead = in.read(buffer)) != -1) {
-                    event.append(new String(buffer));
+                    //event.append(new String(buffer));
+                    baos.write(buffer, 0, bytesRead);
                 }
 
+                String event = baos.toString();
                 log.error("DEBUG: Event: " + event);
                 int endOfProcessingInstruction = event.indexOf("?>");
                 if (endOfProcessingInstruction > 0) {
@@ -71,13 +74,23 @@
         }
         calendar.append("</calendar>");
 
-        //response.getOutputStream();
+        if(viewId != null && viewId.equals("xml")) {
+            //response.getOutputStream();
 
-        View view = new View();
-        //view.setResponse(false);
-	view.setMimeType("application/xml");
-	view.setInputStream(new java.io.StringBufferInputStream(calendar.toString()));
-        return view;
+            View view = new View();
+            //view.setResponse(false);
+	    view.setMimeType("application/xml");
+	    view.setInputStream(new java.io.StringBufferInputStream(calendar.toString()));
+            return view;
+        } else {
+            //response.getOutputStream();
+
+            View view = new View();
+            //view.setResponse(false);
+	    view.setMimeType("application/xml");
+	    view.setInputStream(new java.io.StringBufferInputStream(calendar.toString()));
+            return view;
+        }
     }
 
     /**