Projects >> accumulo >>1496c5f3279e10a7fb52a0d3933f2812ada5950b

Chunk
Conflicting content 
    }
    return mtbw;
  }
<<<<<<< HEAD

=======
  
>>>>>>> ea41264a6648933b265148d6b6032369c88e8627
  public boolean isMultiTableBatchWriterInitialized() {
    return mtbw != null;
  }
Solution content 
    }
    return mtbw;
  }

  public boolean isMultiTableBatchWriterInitialized() {
    return mtbw != null;
  }
File
State.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
<<<<<<< HEAD
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
    
=======

      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }

>>>>>>> ea41264a6648933b265148d6b6032369c88e8627
    // Now we can safely delete the tables
    log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Solution content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
    
    // Now we can safely delete the tables
    log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
File
ImageFixture.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
<<<<<<< HEAD
      
=======

>>>>>>> ea41264a6648933b265148d6b6032369c88e8627
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
Solution content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
File
MultiTableFixture.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
<<<<<<< HEAD
      
=======

>>>>>>> ea41264a6648933b265148d6b6032369c88e8627
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
Solution content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
File
SequentialFixture.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
<<<<<<< HEAD
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
    
=======

      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }

>>>>>>> ea41264a6648933b265148d6b6032369c88e8627
    Connector conn = state.getConnector();
    
    conn.tableOperations().delete((String) state.get("indexTableName"));
Solution content 
      } catch (MutationsRejectedException e) {
        log.error("Ignoring mutations that weren't flushed", e);
      }
      
      // Reset the MTBW on the state to null
      state.resetMultiTableBatchWriter();
    }
    
    Connector conn = state.getConnector();
    
    conn.tableOperations().delete((String) state.get("indexTableName"));
File
ShardFixture.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation