wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r903958 - /incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
Date Thu, 28 Jan 2010 05:02:21 GMT
Author: bluk
Date: Thu Jan 28 05:02:19 2010
New Revision: 903958

URL: http://svn.apache.org/viewvc?rev=903958&view=rev
Log:
Fix error in messages log

Thanks Davanum Srinivas for reporting the issue.

See [WINK-244]

Modified:
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java

Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=903958&r1=903957&r2=903958&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
(original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
Thu Jan 28 05:02:19 2010
@@ -146,7 +146,8 @@
             logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam"),
                         initParameter,
                         DEPLYMENT_CONF_PARAM);
-            // use ClassUtils.loadClass instead of Class.forName so we have classloader visibility
into the Web module in J2EE environments
+            // use ClassUtils.loadClass instead of Class.forName so we have
+            // classloader visibility into the Web module in J2EE environments
             Class<?> confClass = ClassUtils.loadClass(initParameter);
             return (DeploymentConfiguration)confClass.newInstance();
         }
@@ -162,17 +163,19 @@
             logger.info(Messages.getMessage("restServletJAXRSApplicationInitParam"),
                         initParameter,
                         APPLICATION_INIT_PARAM);
-            // use ClassUtils.loadClass instead of Class.forName so we have classloader visibility
into the Web module in J2EE environments
+            // use ClassUtils.loadClass instead of Class.forName so we have
+            // classloader visibility into the Web module in J2EE environments
             appClass = (Class<? extends Application>)ClassUtils.loadClass(initParameter);
             return appClass.newInstance();
         }
         String appLocationParameter = getInitParameter(APP_LOCATION_PARAM);
         if (appLocationParameter == null) {
             logger.warn(Messages.getMessage("propertyNotDefined"), APP_LOCATION_PARAM);
+        } else {
+            logger.info(Messages.getMessage("restServletWinkApplicationInitParam"),
+                        appLocationParameter,
+                        APP_LOCATION_PARAM);
         }
-        logger.info(Messages.getMessage("restServletWinkApplicationInitParam"),
-                    initParameter,
-                    APP_LOCATION_PARAM);
         return new ServletWinkApplication(getServletContext(), appLocationParameter);
     }
 



Mime
View raw message