Fix bug with HTTP GET in query service. fix version # in POM. Clean u…

…p example config.
mulesoft-labs · Jul 11, 2011 · 95be983 · 95be983
1 parent 483fbe0
commit 95be983
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.mulesoft.mql</groupId>
         <artifactId>mql-parent</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>mql-examples</artifactId>

diff --git a/examples/src/main/app/example.properties b/examples/src/main/app/example.properties
diff --git a/examples/src/main/app/mule-config.xml b/examples/src/main/app/mule-config.xml
@@ -12,18 +12,9 @@
                ">
 
     <spring:beans>
-        <!-- Load passwords from external file -->
-        <spring:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-            <spring:property name="locations">
-                <spring:list>
-                    <spring:value>example.properties</spring:value>
-                </spring:list>
-            </spring:property>
-            <spring:property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-        </spring:bean>
-
         <spring:import resource="activity.xml" />
         <spring:import resource="salesforce-join.xml" />
+        <spring:import resource="versioning.xml" />
     </spring:beans>
 
 </mule>

diff --git a/mql-mule/src/main/java/com/mulesoft/mql/mule/QueryService.java b/mql-mule/src/main/java/com/mulesoft/mql/mule/QueryService.java
@@ -23,6 +23,7 @@
 import org.mule.processor.ResponseMessageProcessorAdapter;
 import org.mule.routing.ChoiceRouter;
 import org.mule.transformer.types.DataTypeFactory;
+import org.mule.transport.http.HttpConnector;
 import org.mule.transport.http.transformers.FormTransformer;
 
 public class QueryService extends AbstractFlowConstruct {
@@ -72,7 +73,10 @@ protected Filter getJsonFilter() {
 
             public boolean accept(MuleMessage msg) {
                 Object ct = msg.getInboundProperty("Content-Type");
-                if (ct == null || ct.toString().contains("application/json")) {
+                String method = (String)msg.getInboundProperty(HttpConnector.HTTP_METHOD_PROPERTY);
+
+                if ((ct == null && (method == null || !method.toUpperCase().equals("GET")))
+                        || (ct != null && ct.toString().contains("application/json"))) {
                     return true;
                 }
                 return false;