merge rebase_all

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/juick/http/www/TwitterAuth.java b/src/main/java/com/juick/http/www/TwitterAuth.java
index ff02c28b..bbad4d83 100644
--- a/src/main/java/com/juick/http/www/TwitterAuth.java
+++ b/src/main/java/com/juick/http/www/TwitterAuth.java
@@ -7,6 +7,7 @@ import com.github.scribejava.core.oauth.OAuth10aService;
 import com.github.scribejava.core.oauth.OAuthService;
 import com.juick.server.UserQueries;
 import org.json.JSONObject;
+import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -29,7 +30,7 @@ public class TwitterAuth {
         this.consumerSecret = consumerSecret;
     }
 
-    protected void doGet(Connection sql, HttpServletRequest request, HttpServletResponse response)
+    protected void doGet(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         String hash = "", request_token = "", request_token_secret = "";
         String verifier = request.getParameter("oauth_verifier");