Change-Id: I7a4179f10a4841e80b6546e1e7662cab71eac5e9tags/v1.2.0.201112221803-r
try { | try { | ||||
matcher = new FileNameMatcher(pattern, Character.valueOf('/')); | matcher = new FileNameMatcher(pattern, Character.valueOf('/')); | ||||
} catch (InvalidPatternException e) { | } catch (InvalidPatternException e) { | ||||
e.printStackTrace(); | |||||
// Ignore pattern exceptions | |||||
} | } | ||||
} | } | ||||
} | } |
// Can't decide whether unmerged paths exists. Return | // Can't decide whether unmerged paths exists. Return | ||||
// MERGING state to be on the safe side (in state MERGING | // MERGING state to be on the safe side (in state MERGING | ||||
// you are not allow to do anything) | // you are not allow to do anything) | ||||
e.printStackTrace(); | |||||
} | } | ||||
return RepositoryState.MERGING; | return RepositoryState.MERGING; | ||||
} | } | ||||
} | } | ||||
} catch (IOException e) { | } catch (IOException e) { | ||||
// fall through to CHERRY_PICKING | // fall through to CHERRY_PICKING | ||||
e.printStackTrace(); | |||||
} | } | ||||
return RepositoryState.CHERRY_PICKING; | return RepositoryState.CHERRY_PICKING; |
public void run() { | public void run() { | ||||
try { | try { | ||||
dc.execute(s); | dc.execute(s); | ||||
} catch (RepositoryNotFoundException e) { | |||||
// Ignored. Client cannot use this repository. | |||||
} catch (ServiceNotEnabledException e) { | } catch (ServiceNotEnabledException e) { | ||||
// Ignored. Client cannot use this repository. | // Ignored. Client cannot use this repository. | ||||
} catch (ServiceNotAuthorizedException e) { | } catch (ServiceNotAuthorizedException e) { | ||||
// Ignored. Client cannot use this repository. | // Ignored. Client cannot use this repository. | ||||
} catch (IOException e) { | } catch (IOException e) { | ||||
// Ignore unexpected IO exceptions from clients | // Ignore unexpected IO exceptions from clients | ||||
e.printStackTrace(); | |||||
} finally { | } finally { | ||||
try { | try { | ||||
s.getInputStream().close(); | s.getInputStream().close(); |