github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-10 00:13:17 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1022: Metadata upgrade fails with NPE getConnector method

Browse Source 
(Hari Shreedharan via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2013-04-30 15:21:22 -07:00
parent fbd238627f
commit 7440af2c58
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java
View File

@ -129,6 +129,10 @@ public SqoopConnector getConnector(long connectorId) {
return handler.getConnector(); return handler.getConnector();
} }
public SqoopConnector getConnector(String uniqueName) {
return handlerMap.get(uniqueName).getConnector();
}
public synchronized void initialize() { public synchronized void initialize() {
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("Begin connector manager initialization"); LOG.trace("Begin connector manager initialization");

5
core/src/main/java/org/apache/sqoop/repository/Repository.java
View File

@ -308,8 +308,9 @@ public final void upgradeConnector(MConnector oldConnector,
*/ */
RepositoryTransaction tx = null; RepositoryTransaction tx = null;
try { try {
SqoopConnector connector = ConnectorManager.getInstance().getConnector( SqoopConnector connector =
connectorID); ConnectorManager.getInstance().getConnector(newConnector
.getUniqueName());
MetadataUpgrader upgrader = connector.getMetadataUpgrader(); MetadataUpgrader upgrader = connector.getMetadataUpgrader();
List<MConnection> connections = findConnectionsForConnector( List<MConnection> connections = findConnectionsForConnector(
connectorID); connectorID);