httpsession
diff --git a/‎samples/AllCalls2.java‎
Lines changed: 1 addition & 2 deletions b/‎samples/AllCalls2.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎samples/AllCalls3.java‎
Lines changed: 1 addition & 1 deletion b/‎samples/AllCalls3.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/JdbcQueries.java‎
Lines changed: 7 additions & 7 deletions b/‎samples/JdbcQueries.java‎
Lines changed: 7 additions & 7 deletions
@@ -25,13 +25,12 @@
 
 package com.sun.btrace.samples;
 
-import com.sun.btrace.AnyType;
 import com.sun.btrace.annotations.*;
 import static com.sun.btrace.BTraceUtils.*;
 
 /**
  * This script demonstrates the possibility to intercept
- * method calls that are abou to be executed from the body of
+ * method calls that are about to be executed from the body of
  * a certain method. This is achieved by using the {@linkplain Kind#CALL}
  * location value.
  */
 
@@ -31,7 +31,7 @@
 
 /**
  * This script demonstrates the possibility to intercept
- * method calls that are abou to be executed from the body of
+ * method calls that are about to be executed from the body of
  * a certain method. This is achieved by using the {@linkplain Kind#CALL}
  * location value.
  */
 
@@ -54,6 +54,8 @@
 import com.sun.btrace.annotations.OnEvent;
 import com.sun.btrace.annotations.OnMethod;
 import com.sun.btrace.annotations.TLS;
+import com.sun.btrace.annotations.Return;
+import com.sun.btrace.annotations.Self;
 
 /**
  * BTrace script to print timings for all executed JDBC statements on an event. Demonstrates
@@ -105,7 +107,7 @@ public class JdbcQueries {
      */
     @OnMethod(clazz = "+java.sql.Connection", method = "/prepare.*/")
     public static void onPrepare(AnyType[] args) {
-        preparingStatement = useStackTrace ? jstackStr() : str(args[1]);
+        preparingStatement = useStackTrace ? jstackStr() : str(args[0]);
     }
 
     /**
@@ -115,10 +117,9 @@ public static void onPrepare(AnyType[] args) {
      *            the return value from the prepareXxx() method.
      */
     @OnMethod(clazz = "+java.sql.Connection", method = "/prepare.*/", location = @Location(Kind.RETURN))
-    public static void onPrepareReturn(AnyType arg) {
+    public static void onPrepareReturn(@Return Statement preparedStatement) {
         if (preparingStatement != null) {
             print("P"); // Debug Prepared
-            Statement preparedStatement = (Statement) arg;
             put(preparedStatementDescriptions, preparedStatement, preparingStatement);
             preparingStatement = null;
         }
@@ -129,14 +130,13 @@ public static void onPrepareReturn(AnyType arg) {
     // Otherwise the SQL is in the first argument.
 
     @OnMethod(clazz = "+java.sql.Statement", method = "/execute.*/")
-    public static void onExecute(AnyType[] args) {
-        if (args.length == 1) {
+    public static void onExecute(@Self Statement currentStatement, AnyType[] args) {
+        if (args.length == 0) {
             // No SQL argument; lookup the SQL from the prepared statement
-            Statement currentStatement = (Statement) args[0]; // this
             executingStatement = get(preparedStatementDescriptions, currentStatement);
         } else {
             // Direct SQL in the first argument
-            executingStatement = useStackTrace ? jstackStr() : str(args[1]);
+            executingStatement = useStackTrace ? jstackStr() : str(args[0]);
         }
     }