developless
diff --git a/‎make/build.xml‎
Lines changed: 1 addition & 1 deletion b/‎make/build.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/share/classes/com/sun/btrace/compiler/VerifierVisitor.java‎
Lines changed: 7 additions & 9 deletions b/‎src/share/classes/com/sun/btrace/compiler/VerifierVisitor.java‎
Lines changed: 7 additions & 9 deletions
@@ -294,7 +294,7 @@
         </copy>
     </target>
 
-    <target name="build-traces" depends="jar">
+    <target name="build-traces" depends="jar, compile-tests">
         <echo>executing ${bin.dir}/${btracec} -cp ${build.dir}/test -d ${tests.dir} ${traces.dir}/*.java</echo>
         <apply executable="${bin.dir}/${btracec}"  verbose="true" failonerror="true">
             <fileset dir="${traces.dir}" includes="**/*.java"/>
 
@@ -95,17 +95,15 @@ public Boolean visitMethodInvocation(MethodInvocationTree node, Void v) {
         if (xt.getKind() == Tree.Kind.MEMBER_SELECT) {
             MemberSelectTree mst = (MemberSelectTree)xt;
             xt = mst.getExpression();
-            if (xt.toString().endsWith("Service")) {
-                TypeMirror tm = getType(xt);
-                if (verifier.getTypeUtils().isSubtype(tm, serviceInjectorTm)) {
-                    if (validateInjectionParams(node)) {
-                        return super.visitMethodInvocation(node, v);
-                    } else {
-                        return reportError("service.injector.literals", node);
-                    }
-                } else if (verifier.getTypeUtils().isSubtype(tm, btraceServiceTm)) {
+            TypeMirror tm = getType(xt);
+            if (verifier.getTypeUtils().isSubtype(tm, serviceInjectorTm)) {
+                if (validateInjectionParams(node)) {
                     return super.visitMethodInvocation(node, v);
+                } else {
+                    return reportError("service.injector.literals", node);
                 }
+            } else if (verifier.getTypeUtils().isSubtype(tm, btraceServiceTm)) {
+                return super.visitMethodInvocation(node, v);
             }
         }