X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-xsql%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fxsql%2Fjdbc%2FJDBCServer.java;h=31941e496b4666108b2d03c84939044d288eef3b;hb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f;hp=b348d8fda8b64da5509c39346e976e59b453ed99;hpb=d70f418d19fa09b1efc8fa4ce4ed35f0cf59b73b;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java index b348d8fda8..31941e496b 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java @@ -46,8 +46,7 @@ public class JDBCServer extends Thread { } } - public static void execute(JDBCResultSet rs, XSQLAdapter adapter) - throws SQLException { + public static void execute(JDBCResultSet rs, XSQLAdapter adapter)throws SQLException { if(rs.getSQL().toLowerCase().trim().equals("select 1")){ rs.setFinished(true); return; @@ -193,10 +192,12 @@ public class JDBCServer extends Thread { int braketCount = 0; int endSubQuery = startSubQuery; do { - if (sql.charAt(endSubQuery) == '(') + if (sql.charAt(endSubQuery) == '(') { braketCount++; - else if (sql.charAt(endSubQuery) == ')') + } + else if (sql.charAt(endSubQuery) == ')') { braketCount--; + } endSubQuery++; } while (braketCount > 0 || endSubQuery == sql.length()); String subQuerySQL = sql.substring(startSubQuery + 1,endSubQuery - 1); @@ -338,8 +339,9 @@ public class JDBCServer extends Thread { whereTo = order; } - if(whereTo==-1) + if(whereTo==-1) { whereTo=lowSQL.length(); + } String whereStatement = rs.getSQL().substring(where + 5, whereTo) .trim();