You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/05/12 14:43:36 UTC
[1/2] incubator-ignite git commit: GG-9614 refactoring cleanup
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-9614 e2a0a41b8 -> 1359de6fc
GG-9614 refactoring cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5799f639
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5799f639
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5799f639
Branch: refs/heads/ignite-gg-9614
Commit: 5799f639574d2c21bc5f6ae1c90b340def68439e
Parents: e2a0a41
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue May 12 13:22:59 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue May 12 13:22:59 2015 +0300
----------------------------------------------------------------------
.../eventstorage/GridEventStorageManager.java | 8 ++++++
.../GridLifecycleAwareLocalEventListener.java | 28 ++++++++++++++++++++
.../eventstorage/GridLocalEventListener.java | 1 +
3 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5799f639/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 6ebe480..6683af6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -653,6 +653,14 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
}
}
+ if (lsnr instanceof UserListenerWrapper)
+ {
+ UserListenerWrapper wrapper = (UserListenerWrapper)lsnr;
+
+ if (wrapper.listener() instanceof GridLifecycleAwareLocalEventListener)
+ ((GridLifecycleAwareLocalEventListener)wrapper.listener()).close();
+ }
+
return found;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5799f639/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLifecycleAwareLocalEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLifecycleAwareLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLifecycleAwareLocalEventListener.java
new file mode 100644
index 0000000..31db6ac
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLifecycleAwareLocalEventListener.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.managers.eventstorage;
+
+/**
+ * Special version of listener for events with close callbacks.
+ */
+public interface GridLifecycleAwareLocalEventListener {
+ /**
+ * Closes the listener.
+ */
+ public void close();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5799f639/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
index 137b7b3..d75086a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridLocalEventListener.java
@@ -37,3 +37,4 @@ public interface GridLocalEventListener extends EventListener {
*/
public void onEvent(Event evt);
}
+
[2/2] incubator-ignite git commit: # GG-9614 remote cleanup wip
Posted by vo...@apache.org.
# GG-9614 remote cleanup wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1359de6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1359de6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1359de6f
Branch: refs/heads/ignite-gg-9614
Commit: 1359de6fc63e1452e127f87b51a13a9e25663752
Parents: 5799f63
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue May 12 15:36:49 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue May 12 15:36:49 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/GridEventConsumeHandler.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1359de6f/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 42043f0..b02e66f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -194,6 +194,9 @@ class GridEventConsumeHandler implements GridContinuousHandler {
if (filter instanceof GridLifecycleAwareEventFilter)
((GridLifecycleAwareEventFilter)filter).close();
+
+ if (cb instanceof GridLifecycleAwareLocalEventListener)
+ ((GridLifecycleAwareLocalEventListener)cb).close();
}
/**