You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/11/28 23:15:18 UTC
tomee git commit: Sync
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 5cb361943 -> 674942eb2
Sync
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/674942eb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/674942eb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/674942eb
Branch: refs/heads/tomee-1.7.x
Commit: 674942eb2999352a169f49071702322391e4d9c6
Parents: 5cb3619
Author: andygumbrecht <an...@apache.org>
Authored: Fri Nov 28 23:14:41 2014 +0100
Committer: andygumbrecht <an...@apache.org>
Committed: Fri Nov 28 23:14:41 2014 +0100
----------------------------------------------------------------------
.../apache/openejb/config/NewLoaderLogic.java | 66 ++++++++++----------
.../activemq/OpenEjbBrokerFactoryTest.java | 2 +-
2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/674942eb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
index 9170975..bf96ef6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
@@ -53,13 +53,13 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import static java.util.Arrays.asList;
-
/**
* @version $Rev$ $Date$
*/
public class NewLoaderLogic {
+ private static final Object lock = new Object();
+
private static final Logger logger = DeploymentLoader.logger;
public static final String DEFAULT_EXCLUSIONS_ALIAS = "default-list";
public static final String ADDITIONAL_EXCLUDES = SystemInstance.get().getOptions().get("openejb.additional.exclude", (String) null);
@@ -123,13 +123,13 @@ public class NewLoaderLogic {
// We don't want any of the classes after that
{
final Filter end = Filters.packages(
- "junit.",
- "org.junit.",
- "org.testng.",
- "org.apache.maven.",
- "org.eclipse.",
- "com.intellij.",
- "org.scalatest."
+ "junit.",
+ "org.junit.",
+ "org.testng.",
+ "org.apache.maven.",
+ "org.eclipse.",
+ "com.intellij.",
+ "org.scalatest."
);
// Everything between here and the end is part
@@ -149,9 +149,9 @@ public class NewLoaderLogic {
// Finally filter out everything that we definitely don't want
{
final Filter unwanted = Filters.packages(
- "java.",
- "javax.",
- "sun.reflect."
+ "java.",
+ "javax.",
+ "sun.reflect."
);
final Iterator<String> classes = callers.iterator();
@@ -303,7 +303,7 @@ public class NewLoaderLogic {
@SuppressWarnings("unchecked")
public static Filter getFilter() {
if (filter == null) {
- synchronized (NewLoaderLogic.class) {
+ synchronized (lock) {
if (filter == null) {
filter = new OptimizedExclusionFilter(getExclusions());
}
@@ -455,9 +455,9 @@ public class NewLoaderLogic {
// If the user filtered out too much, that's a problem
if (urlSet.size() == 0) {
final String message = String.format("Classpath Include/Exclude resulted in zero URLs. There were %s possible URLs before filtering and 0 after: include=\"%s\", exclude=\"%s\"",
- beforeFiltering.size(),
- include,
- exclude);
+ beforeFiltering.size(),
+ include,
+ exclude);
logger.error(message);
logger.info("Eligible Classpath before filtering:");
@@ -520,25 +520,25 @@ public class NewLoaderLogic {
} else if (time < 10000) {
logger.warning("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
logger.warning("Consider adjusting your " +
- DeploymentFilterable.CLASSPATH_EXCLUDE +
- " and " +
- DeploymentFilterable.CLASSPATH_INCLUDE +
- " settings. Current settings: exclude='" +
- exclude +
- "', include='" +
- include +
- "'");
+ DeploymentFilterable.CLASSPATH_EXCLUDE +
+ " and " +
+ DeploymentFilterable.CLASSPATH_INCLUDE +
+ " settings. Current settings: exclude='" +
+ exclude +
+ "', include='" +
+ include +
+ "'");
} else {
logger.fatal("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url. TOO LONG!");
logger.fatal("ADJUST THE EXCLUDE/INCLUDE!!!. Current settings: " +
- DeploymentFilterable.CLASSPATH_EXCLUDE +
- "='" +
- exclude +
- "', " +
- DeploymentFilterable.CLASSPATH_INCLUDE +
- "='" +
- include +
- "'");
+ DeploymentFilterable.CLASSPATH_EXCLUDE +
+ "='" +
+ exclude +
+ "', " +
+ DeploymentFilterable.CLASSPATH_INCLUDE +
+ "='" +
+ include +
+ "'");
final List<String> list = new ArrayList<String>();
for (final URL url : urls) {
list.add(url.toExternalForm());
@@ -559,7 +559,7 @@ public class NewLoaderLogic {
private final Set<String> included = new HashSet<String>();
public OptimizedExclusionFilter(final String[] exclusions) {
- included.addAll(asList(exclusions));
+ included.addAll(Arrays.asList(exclusions));
for (final String e : exclusions) {
if (e.endsWith("-")) {
included.add(e.substring(0, e.length() - 1) + ".jar");
http://git-wip-us.apache.org/repos/asf/tomee/blob/674942eb/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
index f228c85..90c939a 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
@@ -46,7 +46,7 @@ import java.util.Map;
import java.util.Properties;
public class OpenEjbBrokerFactoryTest extends TestCase {
- private int brokerPort = NetworkUtil.getNextAvailablePort(new int[]{61616, 0});
+ private final int brokerPort = NetworkUtil.getNextAvailablePort();
public void testBrokerUri() throws Exception {
final String prefix = ActiveMQFactory.getBrokerMetaFile();