svn commit: r882025 - in /incubator/olio/workload/rails/trunk: deploy/services-tools.xml src/org/apache/olio/services/RailsService.java

[sh...@apache.org]

Author: shanti
Date: Thu Nov 19 01:14:31 2009
New Revision: 882025

URL: http://svn.apache.org/viewvc?rev=882025&view=rev
Log:
Fix for OLIO-138. Added check for null/blank server type.

Modified:
    incubator/olio/workload/rails/trunk/deploy/services-tools.xml
    incubator/olio/workload/rails/trunk/src/org/apache/olio/services/RailsService.java

Modified: incubator/olio/workload/rails/trunk/deploy/services-tools.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/deploy/services-tools.xml?rev=882025&r1=882024&r2=882025&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/deploy/services-tools.xml (original)
+++ incubator/olio/workload/rails/trunk/deploy/services-tools.xml Thu Nov 19 01:14:31 2009
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-    Document   : service-tools.xml
-    Created on : April 6, 2009, 1:26 PM
-    Author     : Sheetal Patil
-    Description:
-        Purpose of the document follows.
--->
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
 <services-tools>
     <service id="RailsService">
         <class>org.apache.olio.services.RailsService</class>

Modified: incubator/olio/workload/rails/trunk/src/org/apache/olio/services/RailsService.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/services/RailsService.java?rev=882025&r1=882024&r2=882025&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/src/org/apache/olio/services/RailsService.java (original)
+++ incubator/olio/workload/rails/trunk/src/org/apache/olio/services/RailsService.java Thu Nov 19 01:14:31 2009
@@ -66,7 +66,9 @@
 			return;
         }
 		serverType = ctx.getProperty("type");
-		if (serverType.equals("thin")) {
+		if (serverType == null || serverType.trim().length() == 0)
+			serverType = "other";
+		else if (serverType.equals("thin")) {
             thin = new Thin(ctx);
         }
 		appDir = ctx.getProperty("appDir");