Flume
  1. Flume
  2. FLUME-322

Begin fixing issues found by pmd

    Details

    • Type: Bug Bug
    • Status: Resolved
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: v0.9.4
    • Fix Version/s: v0.9.5
    • Component/s: None
    • Labels:
      None

      Activity

      Hide
      Ashish Paliwal added a comment -

      Patch committed long time ago, marking as resolved

      Show
      Ashish Paliwal added a comment - Patch committed long time ago, marking as resolved
      Hide
      Jonathan Hsieh added a comment -

      committed.

      Show
      Jonathan Hsieh added a comment - committed.
      Hide
      Jonathan Hsieh added a comment -

      Further investigation shows that the two files where the two changes with have problems are using windows new lines as opposed to unix newlines. Will manually fix and convert the two files to unix new lines.

      Show
      Jonathan Hsieh added a comment - Further investigation shows that the two files where the two changes with have problems are using windows new lines as opposed to unix newlines. Will manually fix and convert the two files to unix new lines.
      Hide
      Bruce Mitchener added a comment -

      Updated and rebased against current master.

      Show
      Bruce Mitchener added a comment - Updated and rebased against current master.
      Hide
      Jonathan Hsieh added a comment -

      review: https://review.cloudera.org/r/1175/diff/?page=2
      Want to commit, but oddly I'm having a hard time applying the patch:

      jon@blitzwing:~/flume$ git am ~/Downloads/0001-FLUME-322-Begin-fixing-issues-found-by-PMD.patch
      Applying: FLUME-322: Begin fixing issues found by PMD.
      error: patch failed: src/java/com/cloudera/util/Benchmark.java:93
      error: src/java/com/cloudera/util/Benchmark.java: patch does not apply
      error: patch failed: src/java/com/cloudera/util/ReservoirSampler.java:81
      error: src/java/com/cloudera/util/ReservoirSampler.java: patch does not apply
      Patch failed at 0001 FLUME-322: Begin fixing issues found by PMD.
      When you have resolved this problem run "git am --resolved".
      If you would prefer to skip this patch, instead run "git am --skip".
      To restore the original branch and stop patching run "git am --abort".
      jon@blitzwing:~/flume$

      Looking at it manually I see nothing obviously strange about the changes in those two files. Can someone else try to commit? Alternately, Bruce, can you post on github so I can try to rebase from it?

      Show
      Jonathan Hsieh added a comment - review: https://review.cloudera.org/r/1175/diff/?page=2 Want to commit, but oddly I'm having a hard time applying the patch: jon@blitzwing:~/flume$ git am ~/Downloads/0001- FLUME-322 -Begin-fixing-issues-found-by-PMD.patch Applying: FLUME-322 : Begin fixing issues found by PMD. error: patch failed: src/java/com/cloudera/util/Benchmark.java:93 error: src/java/com/cloudera/util/Benchmark.java: patch does not apply error: patch failed: src/java/com/cloudera/util/ReservoirSampler.java:81 error: src/java/com/cloudera/util/ReservoirSampler.java: patch does not apply Patch failed at 0001 FLUME-322 : Begin fixing issues found by PMD. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". jon@blitzwing:~/flume$ Looking at it manually I see nothing obviously strange about the changes in those two files. Can someone else try to commit? Alternately, Bruce, can you post on github so I can try to rebase from it?

        People

        • Assignee:
          Bruce Mitchener
          Reporter:
          Bruce Mitchener
        • Votes:
          0 Vote for this issue
          Watchers:
          1 Start watching this issue

          Dates

          • Created:
            Updated:
            Resolved:

            Development