Author: sergiykarpenko
Date: 2010-11-25 10:07:35 -0500 (Thu, 25 Nov 2010)
New Revision: 3566
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
Log:
EXOJCR-929: NameNotFoundException catching added to extractDataSourceNames(..)
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2010-11-25
14:51:34 UTC (rev 3565)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2010-11-25
15:07:35 UTC (rev 3566)
@@ -59,6 +59,7 @@
import java.util.concurrent.ConcurrentHashMap;
import javax.jcr.RepositoryException;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.xml.stream.XMLStreamException;
@@ -101,7 +102,7 @@
private final InitialContextInitializer initialContextInitializer;
/**
- * Store of reserved repository names. <tokenname, repositoryname>
+ * Store of reserved repository names. {tokenname, repositoryname}
*/
private final Map<String, String> pendingRepositories = new
ConcurrentHashMap<String, String>();
@@ -151,7 +152,7 @@
public Serializable execute(Serializable[] args) throws Throwable
{
String repositoryName = (String)args[0];
- return reserveRepoName(repositoryName);
+ return reserveRepositoryNameLocally(repositoryName);
}
});
@@ -176,7 +177,7 @@
(RepositoryEntry)(getObject(RepositoryEntry.class,
stringRepositoryEntry
.getBytes(Constants.DEFAULT_ENCODING)));
- createRepo(backupId, rEntry, rToken);
+ createRepositoryLocally(backupId, rEntry, rToken);
return null;
}
finally
@@ -306,7 +307,7 @@
{
try
{
- createRepo(backupId, rEntry, rToken);
+ createRepositoryLocally(backupId, rEntry, rToken);
}
finally
{
@@ -370,11 +371,11 @@
}
else
{
- return reserveRepoName(repositoryName);
+ return reserveRepositoryNameLocally(repositoryName);
}
}
- protected String reserveRepoName(String repositoryName) throws
RepositoryCreationException
+ protected String reserveRepositoryNameLocally(String repositoryName) throws
RepositoryCreationException
{
// check does repository already created
try
@@ -407,7 +408,7 @@
}
}
- protected void createRepo(String backupId, RepositoryEntry rEntry, String rToken)
+ protected void createRepositoryLocally(String backupId, RepositoryEntry rEntry, String
rToken)
throws RepositoryConfigurationException, RepositoryCreationException
{
// check does token registered
@@ -587,6 +588,10 @@
+ " repository contains already binded datasource " +
dbSourceName + ".");
}
}
+ catch (NameNotFoundException e)
+ {
+ // skip this exception
+ }
catch (NamingException e)
{
throw new RepositoryConfigurationException(e.getMessage(), e);
Show replies by date