You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by rg...@apache.org on 2010/06/11 02:47:23 UTC
svn commit: r953520 -
/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
Author: rgardler
Date: Fri Jun 11 00:47:23 2010
New Revision: 953520
URL: http://svn.apache.org/viewvc?rev=953520&view=rev
Log:
avoid decoding null values
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java?rev=953520&r1=953519&r2=953520&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java Fri Jun 11 00:47:23 2010
@@ -329,13 +329,14 @@ public class WidgetInstancesController e
try {
String apiKey = URLDecoder.decode(request.getParameter("api_key"), "UTF-8"); //$NON-NLS-1$
String userId = URLDecoder.decode(request.getParameter("userid"), "UTF-8"); //$NON-NLS-1$
- String sharedDataKey = WidgetInstancesController.getSharedDataKey(request);
- String serviceType = URLDecoder.decode(request.getParameter("servicetype"), "UTF-8"); //$NON-NLS-1$
- String widgetId = URLDecoder.decode(request.getParameter("widgetid"), "UTF-8"); //$NON-NLS-1$
+ String sharedDataKey = WidgetInstancesController.getSharedDataKey(request);
+ String widgetId = request.getParameter("widgetid");
if (widgetId != null){
+ widgetId = URLDecoder.decode(widgetId, "UTF-8"); //$NON-NLS-1$
_logger.info("Looking for widget instance with widgetid of " + widgetId);
instance = WidgetInstance.getWidgetInstanceById(apiKey, userId, sharedDataKey, widgetId);
} else {
+ String serviceType = URLDecoder.decode(request.getParameter("servicetype"), "UTF-8"); //$NON-NLS-1$
_logger.info("Looking for widget instance of service type " + serviceType);
instance = WidgetInstance.getWidgetInstance(apiKey, userId, sharedDataKey, serviceType);
}