Query timeout configured for data source should not override one set at run-time

Issue

• Query timeout configured for data source should not override one set at run-time.
• When a JDBC PreparedStatement is executed, the following code is called, where the call to checkConfiguredQueryTimeout() indirectly calls setQueryTimeout on the underlying Prepared Statement, overwriting one that might have been set just before the call to execute(). Is it possible for EAP to check whether a query timeout has already been set and, if so, do nothing or leave it alone?

try
      {
         checkTransaction();
  try 
      {
         checkConfiguredQueryTimeout();
         return ps.execute();         
      }
      catch (Throwable t)
      {
         throw checkException(t);
      }
    ...