From f6a0fe5c2fd2f9c6455ae0bc3abf50bebfa9b8a2 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Mon, 22 Sep 2014 15:13:35 +0200
Subject: [PATCH] Apply bulk change to 1.3.3

relates to #7729
---
 .../java/org/elasticsearch/action/bulk/BulkItemRequest.java   | 4 ++--
 .../java/org/elasticsearch/action/bulk/BulkShardRequest.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
index 4ce9da3b4a3..9a832d0ac51 100644
--- a/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
+++ b/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
@@ -102,7 +102,7 @@ public class BulkItemRequest implements Streamable {
             request = new UpdateRequest();
         }
         request.readFrom(in);
-        if (in.getVersion().onOrAfter(Version.V_1_4_0_Beta1)) {
+        if (in.getVersion().onOrAfter(Version.V_1_3_3)) {
             if (in.readBoolean()) {
                 primaryResponse = BulkItemResponse.readBulkItem(in);
             }
@@ -121,7 +121,7 @@ public class BulkItemRequest implements Streamable {
             out.writeByte((byte) 2);
         }
         request.writeTo(out);
-        if (out.getVersion().onOrAfter(Version.V_1_4_0_Beta1)) {
+        if (out.getVersion().onOrAfter(Version.V_1_3_3)) {
             out.writeOptionalStreamable(primaryResponse);
             out.writeBoolean(ignoreOnReplica);
         }
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
index 35ab9946904..ddfc300c1ed 100644
--- a/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
+++ b/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
@@ -95,9 +95,9 @@ public class BulkShardRequest extends ShardReplicationOperationRequest<BulkShard
         out.writeVInt(items.length);
         for (BulkItemRequest item : items) {
             if (item != null) {
-                // if we are serializing to a node that is pre 1.4, make sure to pass null to maintain
+                // if we are serializing to a node that is pre 1.3.3, make sure to pass null to maintain
                 // the old behavior of putting null in the request to be ignored on the replicas
-                if (item.isIgnoreOnReplica() && out.getVersion().before(Version.V_1_4_0_Beta1)) {
+                if (item.isIgnoreOnReplica() && out.getVersion().before(Version.V_1_3_3)) {
                     out.writeBoolean(false);
                 } else {
                     out.writeBoolean(true);