Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NIFI-1061' of https://github.com/olegz/nifi into NIFI-1061

This commit is contained in:
Mark Payne 2015-11-11 11:17:25 -05:00
parent 429f6a42bb 76690a8ee9
commit 054774fe7b
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
View File

@ -603,9 +603,12 @@ public final class StandardProcessScheduler implements ProcessScheduler {
}
/**
* Returns the ScheduleState that is registered for the given component; if no ScheduleState current is registered, one is created and registered atomically, and then that value is returned.
* Returns the ScheduleState that is registered for the given component; if
* no ScheduleState current is registered, one is created and registered
* atomically, and then that value is returned.
*
* @param schedulable schedulable
* @param schedulable
* schedulable
* @return scheduled state
*/
private ScheduleState getScheduleState(final Object schedulable) {

19
nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
View File

@ -132,7 +132,13 @@ public class DBCPConnectionPool extends AbstractControllerService implements DBC
}
/**
* Create new pool, open some connections ready to be used
* Configures connection pool by creating an instance of the
* {@link BasicDataSource} based on configuration provided with
* {@link ConfigurationContext}.
*
* This operation makes no guarantees that the actual connection could be
* made since the underlying system may still go off-line during normal
* operation of the connection pool.
*
* @param context
* the configuration context
@ -163,17 +169,6 @@ public class DBCPConnectionPool extends AbstractControllerService implements DBC
dataSource.setUrl(dburl);
dataSource.setUsername(user);
dataSource.setPassword(passw);
// verify connection can be established.
try {
final Connection con = dataSource.getConnection();
if (con == null) {
throw new InitializationException("Connection to database cannot be established.");
}
con.close();
} catch (final SQLException e) {
throw new InitializationException(e);
}
}
/**