Repository: ignite Updated Branches: refs/heads/ignite-3247 e7ce5ddb2 -> 209d7d5b2
WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df6783df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df6783df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df6783df Branch: refs/heads/ignite-3247 Commit: df6783df7fdfbf7f05e660679818a68ea70a483e Parents: e7ce5dd Author: vozerov-gridgain <[email protected]> Authored: Sun Jun 5 17:58:51 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Sun Jun 5 17:58:51 2016 +0300 ---------------------------------------------------------------------- .../igfs/client/IgfsClientDeleteCallable.java | 1 + .../igfs/client/IgfsClientMkdirsCallable.java | 22 +++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df6783df/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java index 9b0095a..cc840b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java @@ -22,6 +22,7 @@ import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.igfs.IgfsContext; +import org.apache.ignite.internal.processors.igfs.IgfsUtils; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/df6783df/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java index f799026..0ef6a04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java @@ -22,10 +22,10 @@ import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.igfs.IgfsContext; +import org.apache.ignite.internal.processors.igfs.IgfsUtils; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; -import java.util.HashMap; import java.util.Map; /** @@ -73,30 +73,14 @@ public class IgfsClientMkdirsCallable extends IgfsClientAbstractCallable<Void> { @Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException { writer.writeObject(path); - if (props != null) { - writer.writeInt(props.size()); - - for (Map.Entry<String, String> prop : props.entrySet()) { - writer.writeString(prop.getKey()); - writer.writeString(prop.getValue()); - } - } - else - writer.writeInt(0); + IgfsUtils.writeProperties(writer, props); } /** {@inheritDoc} */ @Override public void readBinary0(BinaryRawReader reader) throws BinaryObjectException { path = reader.readObject(); - int propsSize = reader.readInt(); - - if (propsSize > 0) { - props = new HashMap<>(propsSize, 1.0f); - - for (int i = 0; i < propsSize; i++) - props.put(reader.readString(), reader.readString()); - } + props = IgfsUtils.readProperties(reader); } /** {@inheritDoc} */
