Author: chetanm
Date: Tue Apr 14 04:58:27 2015
New Revision: 1673355
URL: http://svn.apache.org/r1673355
Log:
OAK-2736 - Oak instance does not close the executors created upon
ContentRepository creation
Reverting the merge due to test failure
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 04:58:27 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673140,1673351
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1673355&r1=1673354&r2=1673355&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
Tue Apr 14 04:58:27 2015
@@ -17,13 +17,11 @@
package org.apache.jackrabbit.oak;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Lists.newArrayList;
import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerObserver;
import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.scheduleWithFixedDelay;
-import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -48,7 +46,6 @@ import javax.management.ObjectName;
import javax.security.auth.login.LoginException;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.io.Closer;
@@ -141,11 +138,6 @@ public class Oak {
private Executor executor;
- private final Closer closer = Closer.create();
-
- private boolean initialized;
-
-
/**
* Default {@code ScheduledExecutorService} used for scheduling background
tasks.
* This default spawns up to 32 background thread on an as need basis. Idle
@@ -203,16 +195,13 @@ public class Oak {
private synchronized ScheduledExecutorService getScheduledExecutor() {
if (scheduledExecutor == null) {
scheduledExecutor = defaultScheduledExecutor();
- closer.register(new ExecutorCloser(scheduledExecutor));
}
return scheduledExecutor;
}
private synchronized Executor getExecutor() {
if (executor == null) {
- ExecutorService executorService = defaultExecutorService();
- executor = executorService;
- closer.register(new ExecutorCloser(executorService));
+ executor = defaultExecutorService();
}
return executor;
}
@@ -522,8 +511,6 @@ public class Oak {
}
public ContentRepository createContentRepository() {
- checkState(!initialized, "Oak instance should be used only once to
create the ContentRepository instance");
- initialized = true;
final List<Registration> regs = Lists.newArrayList();
regs.add(whiteboard.register(Executor.class, getExecutor(),
Collections.emptyMap()));
@@ -598,7 +585,6 @@ public class Oak {
public void close() throws IOException {
super.close();
new CompositeRegistration(regs).unregister();
- closer.close();
}
};
}
@@ -651,17 +637,4 @@ public class Oak {
return createContentSession().getLatestRoot();
}
- private static class ExecutorCloser implements Closeable {
- final ExecutorService executorService;
-
- private ExecutorCloser(ExecutorService executorService) {
- this.executorService = executorService;
- }
-
- @Override
- public void close() throws IOException {
- executorService.shutdown();
- }
- }
-
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java?rev=1673355&r1=1673354&r2=1673355&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
Tue Apr 14 04:58:27 2015
@@ -16,17 +16,11 @@
*/
package org.apache.jackrabbit.oak;
-import java.io.Closeable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-
import javax.jcr.NoSuchWorkspaceException;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
-import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -71,42 +65,4 @@ public class OakTest {
}
- @Test(expected = IllegalStateException.class)
- public void throwISEUponReuse() throws Exception{
- Oak oak = new Oak().with(new OpenSecurityProvider());
- oak.createContentRepository();
- oak.createContentRepository();
- }
-
- @Test
- public void checkExecutorShutdown() throws Exception {
- Runnable runnable = new Runnable() {
- @Override
- public void run() {
-
- }
- };
- Oak oak = new Oak().with(new OpenSecurityProvider());
- ContentRepository repo = oak.createContentRepository();
- WhiteboardUtils.scheduleWithFixedDelay(oak.getWhiteboard(), runnable,
1);
- ((Closeable) repo).close();
-
- try {
- WhiteboardUtils.scheduleWithFixedDelay(oak.getWhiteboard(),
runnable, 1);
- fail("Executor should have rejected the task");
- } catch (RejectedExecutionException ignore) {
-
- }
-
- //Externally passed executor should not be shutdown upon repository
close
- ScheduledExecutorService externalExecutor =
Executors.newSingleThreadScheduledExecutor();
- Oak oak2 = new Oak().with(new
OpenSecurityProvider()).with(externalExecutor);
- ContentRepository repo2 = oak2.createContentRepository();
- WhiteboardUtils.scheduleWithFixedDelay(oak2.getWhiteboard(), runnable,
1);
-
- ((Closeable) repo2).close();
- WhiteboardUtils.scheduleWithFixedDelay(oak2.getWhiteboard(), runnable,
1);
- externalExecutor.shutdown();
- }
-
}
\ No newline at end of file
