IGNITE-1486: Merged master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27ae6881 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27ae6881 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27ae6881 Branch: refs/heads/ignite-1655 Commit: 27ae6881a318f35df670938648b8ce39aa5e4f71 Parents: d124715 Author: vozerov-gridgain <[email protected]> Authored: Wed Oct 21 15:21:19 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Oct 21 15:21:19 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/configuration/CacheConfiguration.java | 1 + .../ignite/marshaller/portable/PortableMarshaller.java | 12 ++++++------ .../junits/multijvm/IgniteCacheProcessProxy.java | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/27ae6881/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index d0b15ce..fd71c1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -51,6 +51,7 @@ import javax.cache.configuration.MutableConfiguration; import javax.cache.expiry.ExpiryPolicy; import java.io.Serializable; import java.util.Collection; +import java.util.HashSet; /** * This class defines grid cache configuration. This configuration is passed to http://git-wip-us.apache.org/repos/asf/ignite/blob/27ae6881/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java index 30a9804..e3905cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java @@ -29,12 +29,12 @@ import org.apache.ignite.internal.portable.GridPortableMarshaller; import org.apache.ignite.internal.portable.PortableContext; import org.apache.ignite.marshaller.AbstractMarshaller; import org.apache.ignite.marshaller.MarshallerContext; -import org.apache.ignite.internal.portable.api.PortableException; -import org.apache.ignite.internal.portable.api.PortableIdMapper; -import org.apache.ignite.internal.portable.api.PortableObject; -import org.apache.ignite.internal.portable.api.PortableProtocolVersion; -import org.apache.ignite.internal.portable.api.PortableSerializer; -import org.apache.ignite.internal.portable.api.PortableTypeConfiguration; +import org.apache.ignite.portable.PortableException; +import org.apache.ignite.portable.PortableIdMapper; +import org.apache.ignite.portable.PortableObject; +import org.apache.ignite.portable.PortableProtocolVersion; +import org.apache.ignite.portable.PortableSerializer; +import org.apache.ignite.portable.PortableTypeConfiguration; import org.jetbrains.annotations.Nullable; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/27ae6881/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index d89e397..6a71f97 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -423,6 +423,11 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { throw new UnsupportedOperationException("Method should be supported."); } + /** {@inheritDoc} */ + @Override public <K1, V1> IgniteCache<K1, V1> withKeepPortable() { + throw new UnsupportedOperationException("Method should be supported."); + } + /** * */
