Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA84A1831F for ; Wed, 21 Oct 2015 14:49:55 +0000 (UTC) Received: (qmail 97689 invoked by uid 500); 21 Oct 2015 14:49:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 97603 invoked by uid 500); 21 Oct 2015 14:49:55 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 97587 invoked by uid 99); 21 Oct 2015 14:49:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 14:49:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E6EEE0451; Wed, 21 Oct 2015 14:49:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 21 Oct 2015 14:50:07 -0000 Message-Id: <9d6ce044668a45fbacbf7f3614ea7653@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/20] ignite git commit: IGNITE-1651: Fixes after merge. IGNITE-1651: Fixes after merge. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35acc405 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35acc405 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35acc405 Branch: refs/heads/ignite-1651 Commit: 35acc405829a8d9807003f4cba1e8bc31ebdff11 Parents: 0022344 Author: vozerov-gridgain Authored: Wed Oct 21 15:23:50 2015 +0300 Committer: vozerov-gridgain Committed: Wed Oct 21 15:23:50 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/portable/PortableUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/35acc405/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java index c52df30..10970a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableUtils.java @@ -17,6 +17,13 @@ package org.apache.ignite.internal.portable; +import org.apache.ignite.internal.portable.builder.PortableLazyValue; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.portable.PortableException; +import org.apache.ignite.portable.PortableObject; +import org.jetbrains.annotations.Nullable; +import org.jsr166.ConcurrentHashMap8; + import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Collection; @@ -34,13 +41,6 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; -import org.apache.ignite.internal.portable.api.PortableException; -import org.apache.ignite.internal.portable.builder.PortableLazyValue; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.portable.PortableObject; -import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; - import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN; import static org.apache.ignite.internal.portable.GridPortableMarshaller.BOOLEAN_ARR; import static org.apache.ignite.internal.portable.GridPortableMarshaller.BYTE;