OPENDJ-3400 PDB WriteableTransaction should correctly manage Rollback excep...

Fabio Pistolesi

24.42.2016 7e3d34eeccce01fabf766ef7250ac1e940ec7bad

 opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java

@@ -632,9 +632,16 @@
        txn.begin();
        try
        {
          operation.run(this);
          txn.commit(commitPolicy);
          return;
          try
          {
            operation.run(this);
            txn.commit(commitPolicy);
            return;
          }
          catch (final StorageRuntimeException e)
          {
            throw unwrap(e);
          }
        }
        catch (final RollbackException e)
        {
@@ -1035,11 +1042,7 @@
    }
    catch (final StorageRuntimeException e)
    {
      if (e.getCause() != null)
      {
        throw (Exception) e.getCause();
      }
      throw e;
      throw unwrap(e);
    }
  }

@@ -1059,14 +1062,19 @@
    }
    catch (final StorageRuntimeException e)
    {
      if (e.getCause() != null)
      {
        throw (Exception) e.getCause();
      }
      throw e;
      throw unwrap(e);
    }
  }

  private Exception unwrap(StorageRuntimeException e) throws Exception
  {
    if (e.getCause() != null)
    {
      throw (Exception) e.getCause();
    }
    throw e;
  }

  @Override
  public boolean supportsBackupAndRestore()
  {