/*
 * Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
 * license agreements.  See the NOTICE file distributed with this work for
 * additional information regarding copyright ownership.  Crate licenses
 * this file to you under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.  You may
 * obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
 * License for the specific language governing permissions and limitations
 * under the License.
 *
 * However, if you have executed another commercial license agreement
 * with Crate these terms will supersede the license and you may use the
 * software solely pursuant to the terms of the relevant commercial agreement.
 */

package io.crate.operator.reference.sys.shard;

import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.index.shard.service.IndexShard;

public class ShardRelocatingNodeExpression extends SysShardExpression<BytesRef> {

    public static final String NAME = "relocating_node";

    private final IndexShard indexShard;

    @Inject
    public ShardRelocatingNodeExpression(IndexShard indexShard) {
        super(NAME);
        this.indexShard = indexShard;
    }

    @Override
    public BytesRef value() {
        return new BytesRef(indexShard.routingEntry().relocatingNodeId());
    }
}
@@ -1589,28 +1589,34 @@
     
-return new BytesRef(
+String relocatingNodeId = 
 inde
@@ -1655,17 +1655,138 @@
 NodeId()
-)
+;%0A        if (relocatingNodeId != null) %7B%0A            return new BytesRef(relocatingNodeId);%0A        %7D%0A        return null
 ;%0A    %7D%0A

fix NPE in ShardRelocatingNodeExpression