You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/23 15:53:13 UTC
[30/33] incubator-ignite git commit: ignite-950: fixed memory leak
ignite-950: fixed memory leak
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a088170b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a088170b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a088170b
Branch: refs/heads/ignite-950
Commit: a088170ba796f4e8a93ad65c19f5f81d51633ca7
Parents: 42ec7d0
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 23 10:16:07 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 23 10:16:07 2015 +0300
----------------------------------------------------------------------
.../optimized/ext/OptimizedMarshallerExt.java | 5 +++++
.../optimized/ext/OptimizedObjectInputStreamExt.java | 7 +++++++
.../optimized/ext/OptimizedObjectOutputStreamExt.java | 14 +++++++-------
3 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a088170b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedMarshallerExt.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedMarshallerExt.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedMarshallerExt.java
index da803d1..6bfe9c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedMarshallerExt.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedMarshallerExt.java
@@ -156,6 +156,11 @@ public class OptimizedMarshallerExt extends OptimizedMarshaller {
}
/** {@inheritDoc} */
+ @Override public void setPoolSize(int poolSize) {
+ OptimizedObjectStreamExtRegistry.poolSize(poolSize);
+ }
+
+ /** {@inheritDoc} */
@Override public void marshal(@Nullable Object obj, OutputStream out) throws IgniteCheckedException {
assert out != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a088170b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectInputStreamExt.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectInputStreamExt.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectInputStreamExt.java
index 7eb1fe6..1b75f57 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectInputStreamExt.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectInputStreamExt.java
@@ -69,6 +69,13 @@ public class OptimizedObjectInputStreamExt extends OptimizedObjectInputStream {
return in.readByte();
}
+ /** {@inheritDoc} */
+ @Override public void close() throws IOException {
+ super.close();
+
+ metaHandler = null;
+ }
+
/**
* Checks whether the object has a field with name {@code fieldName}.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a088170b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectOutputStreamExt.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectOutputStreamExt.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectOutputStreamExt.java
index 7ccb4b0..8ae8f9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectOutputStreamExt.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/ext/OptimizedObjectOutputStreamExt.java
@@ -74,6 +74,13 @@ public class OptimizedObjectOutputStreamExt extends OptimizedObjectOutputStream
return null;
}
+ /** {@inheritDoc} */
+ @Override public void close() throws IOException {
+ super.close();
+
+ metaHandler = null;
+ }
+
/**
*
*/
@@ -168,12 +175,5 @@ public class OptimizedObjectOutputStreamExt extends OptimizedObjectOutputStream
writeShort(footerLen);
}
}
-
- /**
- * Disable footer and indexing for the given Object.
- */
- private void disable() {
- data = null;
- }
}
}