Revision 12 trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerSQLHelper.java

View differences:

MSSQLServerSQLHelper.java
101 101 
            dataSource.setDriverClassName(params.getJDBCDriverClassName());
102 102 
            dataSource.setUsername(params.getUser());
103 103 
            dataSource.setPassword(params.getPassword());
104 
            dataSource.setUrl(getConnectionURL(params));
104 
            dataSource.setUrl(params.getUrl());
105 105 

  		




  106
  106
  
    
            dataSource.setMaxWait(60L * 1000);


  		




  107
  107
  
    
            return dataSource;


  		




  ......




  142
  142
  
    
    public Connection getConnection() throws AccessResourceException {


  		




  143
  143
  
    
        try {


  		




  144
  144
  
    
            if (this.connectionProvider == null) {


  		




  145
  
  
    
                this.connectionProvider = new ConnectionProvider(connectionParameters);


  		




  
  145
  
    
                this.connectionProvider = new ConnectionProvider(this.getConnectionParameters());


  		




  146
  146
  
    
            }


  		




  147
  147
  
    
            return this.connectionProvider.getConnection();


  		




  148
  148
  
    
        } catch (SQLException ex) {


  		




  149
  149
  
    
            throw new AccessResourceException(MSSQLServerLibrary.NAME, ex);


  		




  150
  150
  
    
        }


  		




  151
  151
  
    
    }


  		




  
  152
  
    
    


  		




  
  153
  
    
    @Override


  		




  
  154
  
    
    public String getConnectionURL() {


  		




  
  155
  
    
        return getConnectionURL(this.getConnectionParameters());


  		




  
  156
  
    
    }


  		




  152
  157
  
    

  		




  153
  158
  
    
    @Override


  		




  154
  159
  
    
    protected String getResourceType() {


  		












Also available in:  Unified diff