ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [04/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-1
Date Tue, 10 Mar 2015 07:02:41 GMT
Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-futures-cleanup-1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdd6652b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdd6652b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdd6652b

Branch: refs/heads/ignite-414
Commit: bdd6652b9e1479e80dfa9b9165250c7b890b9b06
Parents: 83c1064 9bc57f0
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Mar 5 21:49:31 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Mar 5 21:49:31 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridKernalContext.java      |  30 ++
 .../ignite/internal/GridKernalContextImpl.java  |  23 ++
 .../ignite/internal/GridUpdateNotifier.java     |  16 +-
 .../apache/ignite/internal/IgniteKernal.java    | 275 +++++++++----------
 .../org/apache/ignite/internal/SkipDaemon.java  |  29 ++
 .../ignite/internal/managers/GridManager.java   |  20 +-
 .../internal/managers/GridManagerAdapter.java   |  73 ++---
 .../checkpoint/GridCheckpointManager.java       |   4 +-
 .../collision/GridCollisionManager.java         |   4 +-
 .../discovery/GridDiscoveryManager.java         |  38 ++-
 .../managers/indexing/GridIndexingManager.java  |   4 +-
 .../swapspace/GridSwapSpaceManager.java         |   4 +-
 .../internal/processors/GridProcessor.java      |  11 +-
 .../processors/GridProcessorAdapter.java        |   5 -
 .../processors/cache/GridCacheProcessor.java    |  56 ++--
 .../clock/GridClockSyncProcessor.java           |   9 +-
 .../internal/processors/igfs/IgfsProcessor.java | 102 ++++---
 .../processors/job/GridJobProcessor.java        |   1 +
 .../processors/rest/GridRestProcessor.java      |  64 ++---
 .../streamer/GridStreamProcessor.java           |  31 +--
 .../apache/ignite/plugin/PluginProvider.java    |   3 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |  20 +-
 .../ignite/spi/IgniteSpiConsistencyChecked.java |   7 -
 .../internal/GridDiscoveryEventSelfTest.java    |  44 ---
 ...unctionExcludeNeighborsAbstractSelfTest.java |   1 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  11 +-
 26 files changed, 426 insertions(+), 459 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdd6652b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdd6652b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdd6652b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 850a096,97d3aa0..2945eb2
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@@ -177,18 -180,13 +180,13 @@@ public class GridRestProcessor extends 
  
                  GridRestResponse res = new GridRestResponse(STATUS_SECURITY_CHECK_FAILED,
e.getMessage());
  
-                 try {
-                     updateSession(req, subjCtx);
-                     res.sessionTokenBytes(new byte[0]);
-                 }
-                 catch (IgniteCheckedException e1) {
-                     U.warn(log, "Cannot update response session token: " + e1.getMessage());
-                 }
+                 updateSession(req, subjCtx);
+                 res.sessionTokenBytes(ZERO_BYTES);
  
 -                return new GridFinishedFuture<>(ctx, res);
 +                return new GridFinishedFuture<>(res);
              }
              catch (IgniteCheckedException e) {
 -                return new GridFinishedFuture<>(ctx, new GridRestResponse(STATUS_AUTH_FAILED,
e.getMessage()));
 +                return new GridFinishedFuture<>(new GridRestResponse(STATUS_AUTH_FAILED,
e.getMessage()));
              }
          }
  


Mime
View raw message