[Bedework-commit] rpiutil r45 - trunk/src/edu/rpi/sss/util/servlets

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-31 15:16:42 -0400 (Thu, 31 May 2007)
New Revision: 45

Modified:
   trunk/src/edu/rpi/sss/util/servlets/HttpServletUtils.java
Log:
Fix up logging errro in portlet on upload

Add error message for duplicate calendars in admin

Modified: trunk/src/edu/rpi/sss/util/servlets/HttpServletUtils.java
===================================================================
--- trunk/src/edu/rpi/sss/util/servlets/HttpServletUtils.java	2007-05-29 13:52:50 UTC (rev 44)
+++ trunk/src/edu/rpi/sss/util/servlets/HttpServletUtils.java	2007-05-31 19:16:42 UTC (rev 45)
@@ -144,12 +144,12 @@
    *  @return  String      url from the request
    */
   public static String getUrl(HttpServletRequest request) {
-    if (request instanceof MultipartRequestWrapper) {
-      return ((MultipartRequestWrapper)request).getRequest().
-                      getRequestURL().toString();
-    }
+    try {
+      if (request instanceof MultipartRequestWrapper) {
+        return ((MultipartRequestWrapper)request).getRequest().
+        getRequestURL().toString();
+      }
 
-    try {
       StringBuffer sb = request.getRequestURL();
       if (sb != null) {
         return sb.toString();