1. 04 Mar, 2015 2 commits
    • Andy Wilkinson's avatar
      Merge branch '1.2.x' · 6a32519a
      Andy Wilkinson authored
      6a32519a
    • Andy Wilkinson's avatar
      Honor unpack for war files · f761916b
      Andy Wilkinson authored
      Previously repackaging of an archive was performed in three steps:
      
      1. Write the manifest
      2. Write entries from the source archive into the destination
      3. Write any libraries into the destination if they’re not already there
      
      This worked fine for jar files, but not for war files. In the war file
      case the libraries are already in the source archive’s WEB-INF/lib
      directory so they’re copied into the destination in step 2. This means
      that step 3 largely becomes a no-op and, crucially, the UNPACK comment
      is not applied to any libraries that require it.
      
      This commit reorders steps 2 and 3 so that the libraries are copied into
      the destination first (allowing the UNPACK comment to be written, if
      required) and then any entries in the source are written into the
      destination if they’re not already there.
      
      Fixes gh-2588
      f761916b
  2. 03 Mar, 2015 2 commits
    • Andy Wilkinson's avatar
      Merge branch '1.2.x' · 3ce45c0b
      Andy Wilkinson authored
      3ce45c0b
    • Andy Wilkinson's avatar
      Make MetricRegistryMetricReader thread-safe · ee567fa8
      Andy Wilkinson authored
      MetricRegistryMetricReader’s fields where neither final, nor volatile
      but could be accessed on multiple threads. This lead to visibility
      problems where the value of a field would unexpectedly be null, causing
      an NPE.
      
      This commit updates all of the fields to declare them as final, thereby
      ensuring that their values are guaranteed to be visible across different
      threads.
      
      Fixes gh-2590
      ee567fa8
  3. 02 Mar, 2015 7 commits
  4. 27 Feb, 2015 3 commits
  5. 26 Feb, 2015 13 commits
  6. 25 Feb, 2015 13 commits