Author: rareddy
Date: 2012-08-28 14:31:49 -0400 (Tue, 28 Aug 2012)
New Revision: 4377
Modified:
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/RestASMBasedWebArchiveBuilder.java
Log:
TEIID-2158: Fixing the issue with hardcoded model name
Modified:
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/RestASMBasedWebArchiveBuilder.java
===================================================================
---
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/RestASMBasedWebArchiveBuilder.java 2012-08-28
12:16:57 UTC (rev 4376)
+++
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/RestASMBasedWebArchiveBuilder.java 2012-08-28
18:31:49 UTC (rev 4377)
@@ -288,8 +288,8 @@
}
}
- buildQueryProcedure(vdbName, vdbVersion, "xml", cw, passthroughAuth);
- buildQueryProcedure(vdbName, vdbVersion, "json", cw, passthroughAuth);
+ buildQueryProcedure(vdbName, vdbVersion, modelName, "xml", cw,
passthroughAuth);
+ buildQueryProcedure(vdbName, vdbVersion, modelName, "json", cw,
passthroughAuth);
cw.visitEnd();
@@ -451,7 +451,7 @@
}
}
- private void buildQueryProcedure(String vdbName, int vdbVersion, String context,
ClassWriter cw, boolean passthroughAuth) {
+ private void buildQueryProcedure(String vdbName, int vdbVersion, String modelName,
String context, ClassWriter cw, boolean passthroughAuth) {
MethodVisitor mv;
{
AnnotationVisitor av0;
@@ -491,7 +491,7 @@
mv.visitVarInsn(ALOAD, 1);
mv.visitInsn(context.equals("xml")?ICONST_0:ICONST_1);
mv.visitInsn(passthroughAuth?ICONST_1:ICONST_0);
- mv.visitMethodInsn(INVOKEVIRTUAL, "org/teiid/jboss/rest/View",
"executeQuery",
"(Ljava/lang/String;ILjava/lang/String;ZZ)Ljava/io/InputStream;");
+ mv.visitMethodInsn(INVOKEVIRTUAL, "org/teiid/jboss/rest/"+modelName,
"executeQuery",
"(Ljava/lang/String;ILjava/lang/String;ZZ)Ljava/io/InputStream;");
mv.visitLabel(l1);
mv.visitInsn(ARETURN);
mv.visitLabel(l2);
Show replies by date