755. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 10/18/2018 2:02:17 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

755.1 Files compared

# Location File Last Modified
1 VIX_SIV_v3_0_patch_201_build_8.zip\v3.0_patch_201_build_8\VISA\Java\CacheImplJCIFS\main\src\java\gov\va\med\imaging\storage\cache\impl\jcifs SmbUtilities.java Thu Oct 11 13:30:15 2018 UTC
2 VIX_SIV_v3_0_patch_201_build_8.zip\v3.0_patch_201_build_8\VISA\Java\CacheImplJCIFS\main\src\java\gov\va\med\imaging\storage\cache\impl\jcifs SmbUtilities.java Wed Oct 17 18:45:25 2018 UTC

755.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 134
Changed 1 2
Inserted 0 0
Removed 0 0

755.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

755.4 Active regular expressions

No regular expressions were active.

755.5 Comparison detail

  1   /**
  2    * 
  3    */
  4   package go v.va.med.i maging.sto rage.cache .impl.jcif s;
  5  
  6   import org .apache.lo gging.log4 j.LogManag er;
  7  
  8   import jci fs.smb.Smb Exception;
  9   import jci fs.smb.Smb File;
  10   import jci fs.smb.Smb FileFilter ;
  11  
  12   /**
  13    * @author   PI I
  14    *
  15    */
  16   public cla ss SmbUtil ities
  17   {
  18           /* *
  19            *  Get all o f the file s in our d irectory.
  20            *  All files  (not dire ctories) a re conside red child  instances  of this gr oup.
  21            *  
  22            *  @return
  23            * /
  24           pu blic SmbFi le[] getPe rsistentCh ildren(Smb File direc tory, bool ean includ eDirectori es, boolea n includeF iles)
  25           {
  26                    SmbF ile[] chil dFiles = n ull;
  27                    try
  28                    {
  29                             childF iles = dir ectory.lis tFiles( ne w SmbFileD irectoryFi lter(inclu deDirector ies, inclu deFiles) ) ;
  30                    } 
  31                    catc h (SmbExce ption x)
  32                    {
  33                             LogMan ager.getLo gger(SmbUt ilities.cl ass).error (x);
  34                    }
  35  
  36                    // r eturn an e mpty array  even if t he group d irectory d oes not ex ist
  37                    retu rn childFi les == nul l ? new Sm bFile[]{}  : childFil es;
  38           }
  39           
  40           pr ivate clas s SmbFileD irectoryFi lter
  41           im plements S mbFileFilt er
  42           {
  43                    priv ate boolea n includeD irectories ;
  44                    priv ate boolea n includeF iles;
  45                    
  46                    SmbF ileDirecto ryFilter(b oolean inc ludeDirect ories, boo lean inclu deFiles)
  47                    {
  48                             this.i ncludeDire ctories =  includeDir ectories;
  49                             this.i ncludeFile s = includ eFiles;
  50                    }
  51                    
  52                    publ ic boolean  accept(Sm bFile path name)
  53                    {
  54                             try
  55                             {
  56                                      return 
  57                                      (include Directorie s && pathn ame.isDire ctory()) |
  58                                      (include Files && !  pathname. isDirector y());
  59                             } 
  60                             catch  (SmbExcept ion x)
  61                             {
  62                                      LogManag er.getLogg er(SmbUtil ities.clas s).error(x );
  63                                      return f alse;
  64                             }
  65                    }
  66           }
  67  
  68   }