ICU 56 update step 1

source/common/uvectr64.cpp

 /*
 ******************************************************************************
-* Copyright (C) 1999-2010, International Business Machines Corporation and   *
-* others. All Rights Reserved.                                               *
+* Copyright (C) 1999-2015, International Business Machines Corporation and
+* others. All Rights Reserved.
 ******************************************************************************
 */
 
 #include "uvectr64.h"
 #include "cmemory.h"
 #include "putilimp.h"
 
 U_NAMESPACE_BEGIN
 
 #define DEFAULT_CAPACITY 8
@@ skipping 92 matching lines @@
         ++count;
     }
     /* else index out of range */
 }
 
 void UVector64::removeAllElements(void) {
     count = 0;
 }
 
 UBool UVector64::expandCapacity(int32_t minimumCapacity, UErrorCode &status) {
+    if (U_FAILURE(status)) {
+        return FALSE;
+    }
     if (minimumCapacity < 0) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return FALSE;
     }
     if (capacity >= minimumCapacity) {
         return TRUE;
     }
     if (maxCapacity>0 && minimumCapacity>maxCapacity) {
         status = U_BUFFER_OVERFLOW_ERROR;
         return FALSE;
@@ skipping 73 matching lines @@
         }
         for (i=count; i<newSize; ++i) {
             elements[i] = 0;
         }
     } 
     count = newSize;
 }
 
 U_NAMESPACE_END