Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-9614 01eddc65d -> f0c0af9d7
# GG-9614 review Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e49c66ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e49c66ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e49c66ff Branch: refs/heads/ignite-gg-9614 Commit: e49c66ff3eebb1f68eec6beea577e5705daf5958 Parents: da43ab2 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Tue May 19 18:14:13 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Tue May 19 18:14:13 2015 +0300 ---------------------------------------------------------------------- .../internal/GridEventConsumeHandler.java | 8 ++--- .../interop/InteropAwareEventFilter.java | 38 ++++++++++++++++++++ .../internal/interop/InteropEventFilter.java | 38 -------------------- .../eventstorage/GridEventStorageManager.java | 4 +-- 4 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e49c66ff/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 a653542..505204d 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 @@ -125,8 +125,8 @@ class GridEventConsumeHandler implements GridContinuousHandler { if (filter != null) ctx.resource().injectGeneric(filter); - if (filter instanceof InteropEventFilter) - ((InteropEventFilter)filter).initialize(ctx); + if (filter instanceof InteropAwareEventFilter) + ((InteropAwareEventFilter)filter).initialize(ctx); final boolean loc = nodeId.equals(ctx.localNodeId()); @@ -196,8 +196,8 @@ class GridEventConsumeHandler implements GridContinuousHandler { RuntimeException err = null; try { - if (filter instanceof InteropEventFilter) - ((InteropEventFilter)filter).close(); + if (filter instanceof InteropAwareEventFilter) + ((InteropAwareEventFilter)filter).close(); } catch(RuntimeException ex) { err = ex; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e49c66ff/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java new file mode 100644 index 0000000..3aeb53d --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropAwareEventFilter.java @@ -0,0 +1,38 @@ +/* + * 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.interop; + +import org.apache.ignite.*; +import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.lang.*; + +/** + * Special version of predicate for events with initialize/close callbacks. + */ +public interface InteropAwareEventFilter<E extends Event> extends IgnitePredicate<E> { + /** + * Initializes the filter. + */ + public void initialize(GridKernalContext ctx); + + /** + * Closes the filter. + */ + public void close(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e49c66ff/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropEventFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropEventFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropEventFilter.java deleted file mode 100644 index 7afb6fe..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropEventFilter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.interop; - -import org.apache.ignite.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; - -/** - * Special version of predicate for events with initialize/close callbacks. - */ -public interface InteropEventFilter<E extends Event> extends IgnitePredicate<E> { - /** - * Initializes the filter. - */ - public void initialize(GridKernalContext ctx); - - /** - * Closes the filter. - */ - public void close(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e49c66ff/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 bccc920..95c5eb1 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 @@ -761,8 +761,8 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> public <T extends Event> Collection<T> localEvents(IgnitePredicate<T> p) { assert p != null; - if (p instanceof InteropEventFilter) { - InteropEventFilter p0 = (InteropEventFilter)p; + if (p instanceof InteropAwareEventFilter) { + InteropAwareEventFilter p0 = (InteropAwareEventFilter)p; p0.initialize(ctx);
