ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ExecutorsTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.9 by tim, Tue Dec 9 19:09:24 2003 UTC vs.
Revision 1.12 by dl, Sat Dec 27 19:26:43 2003 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9  
# Line 20 | Line 21 | public class ExecutorsTest extends JSR16
21          return new TestSuite(ExecutorsTest.class);
22      }
23  
23    private static final String TEST_STRING = "a test string";
24
25    private static class StringTask implements Callable<String> {
26        public String call() { return TEST_STRING; }
27    }
28
29    static class DirectExecutor implements Executor {
30        public void execute(Runnable r) {
31            r.run();
32        }
33    }
34
24      static class TimedCallable<T> implements Callable<T> {
25 <        private final Executor exec;
25 >        private final ExecutorService exec;
26          private final Callable<T> func;
27          private final long msecs;
28          
29 <        TimedCallable(Executor exec, Callable<T> func, long msecs) {
29 >        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30              this.exec = exec;
31              this.func = func;
32              this.msecs = msecs;
33          }
34          
35          public T call() throws Exception {
36 <            Future<T> ftask = Executors.execute(exec, func);
36 >            Future<T> ftask = exec.submit(func);
37              try {
38                  return ftask.get(msecs, TimeUnit.MILLISECONDS);
39              } finally {
# Line 142 | Line 131 | public class ExecutorsTest extends JSR16
131      }
132  
133      /**
134 +     * A new SingleThreadExecutor cannot be casted to concrete implementation
135 +     */
136 +    public void testCastNewSingleThreadExecutor() {
137 +        ExecutorService e = Executors.newSingleThreadExecutor();
138 +        try {
139 +            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
140 +        } catch (ClassCastException success) {
141 +        } finally {
142 +            joinPool(e);
143 +        }
144 +    }
145 +
146 +
147 +    /**
148       * A new newFixedThreadPool can execute runnables
149       */
150      public void testNewFixedThreadPool1() {
# Line 187 | Line 190 | public class ExecutorsTest extends JSR16
190          }
191      }
192  
190    /**
191     * execute of runnable runs it to completion
192     */
193    public void testExecuteRunnable() {
194        try {
195            Executor e = new DirectExecutor();
196            TrackedShortRunnable task = new TrackedShortRunnable();
197            assertFalse(task.done);
198            Future<?> future = Executors.execute(e, task);
199            future.get();
200            assertTrue(task.done);
201        }
202        catch (ExecutionException ex) {
203            unexpectedException();
204        }
205        catch (InterruptedException ex) {
206            unexpectedException();
207        }
208    }
209
210    /**
211     * invoke of a runnable runs it to completion
212     */
213    public void testInvokeRunnable() {
214        try {
215            Executor e = new DirectExecutor();
216            TrackedShortRunnable task = new TrackedShortRunnable();
217            assertFalse(task.done);
218            Executors.invoke(e, task);
219            assertTrue(task.done);
220        }
221        catch (ExecutionException ex) {
222            unexpectedException();
223        }
224        catch (InterruptedException ex) {
225            unexpectedException();
226        }
227    }
228
229    /**
230     * execute of a callable runs it to completion
231     */
232    public void testExecuteCallable() {
233        try {
234            Executor e = new DirectExecutor();
235            Future<String> future = Executors.execute(e, new StringTask());
236            String result = future.get();
237            assertSame(TEST_STRING, result);
238        }
239        catch (ExecutionException ex) {
240            unexpectedException();
241        }
242        catch (InterruptedException ex) {
243            unexpectedException();
244        }
245    }
246
247
248    /**
249     * execute of a privileged action runs it to completion
250     */
251    public void testExecutePrivilegedAction() {
252        Policy savedPolicy = Policy.getPolicy();
253        AdjustablePolicy policy = new AdjustablePolicy();
254        policy.addPermission(new RuntimePermission("getContextClassLoader"));
255        policy.addPermission(new RuntimePermission("setContextClassLoader"));
256        Policy.setPolicy(policy);
257        try {
258            Executor e = new DirectExecutor();
259            Future future = Executors.execute(e, new PrivilegedAction() {
260                    public Object run() {
261                        return TEST_STRING;
262                    }});
263
264            Object result = future.get();
265            assertSame(TEST_STRING, result);
266        }
267        catch (ExecutionException ex) {
268            unexpectedException();
269        }
270        catch (InterruptedException ex) {
271            unexpectedException();
272        }
273        finally {
274            Policy.setPolicy(savedPolicy);
275        }
276    }
277
278    /**
279     * execute of a privileged exception action runs it to completion
280     */
281    public void testExecutePrivilegedExceptionAction() {
282        Policy savedPolicy = Policy.getPolicy();
283        AdjustablePolicy policy = new AdjustablePolicy();
284        policy.addPermission(new RuntimePermission("getContextClassLoader"));
285        policy.addPermission(new RuntimePermission("setContextClassLoader"));
286        Policy.setPolicy(policy);
287        try {
288            Executor e = new DirectExecutor();
289            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
290                    public Object run() {
291                        return TEST_STRING;
292                    }});
293
294            Object result = future.get();
295            assertSame(TEST_STRING, result);
296        }
297        catch (ExecutionException ex) {
298            unexpectedException();
299        }
300        catch (InterruptedException ex) {
301            unexpectedException();
302        }
303        finally {
304            Policy.setPolicy(savedPolicy);
305        }
306    }
307
308    /**
309     * execute of a failed privileged exception action reports exception
310     */
311    public void testExecuteFailedPrivilegedExceptionAction() {
312        Policy savedPolicy = Policy.getPolicy();
313        AdjustablePolicy policy = new AdjustablePolicy();
314        policy.addPermission(new RuntimePermission("getContextClassLoader"));
315        policy.addPermission(new RuntimePermission("setContextClassLoader"));
316        Policy.setPolicy(policy);
317        try {
318            Executor e = new DirectExecutor();
319            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
320                    public Object run() throws Exception {
321                        throw new IndexOutOfBoundsException();
322                    }});
323
324            Object result = future.get();
325            shouldThrow();
326        }
327        catch (ExecutionException success) {
328        }
329        catch (InterruptedException ex) {
330            unexpectedException();
331        }
332        finally {
333            Policy.setPolicy(savedPolicy);
334        }
335    }
193  
194      /**
195 <     * invoke of a collable runs it to completion
195 >     * An unconfigurable newFixedThreadPool can execute runnables
196       */
197 <    public void testInvokeCallable() {
198 <        try {
199 <            Executor e = new DirectExecutor();
200 <            String result = Executors.invoke(e, new StringTask());
201 <
202 <            assertSame(TEST_STRING, result);
346 <        }
347 <        catch (ExecutionException ex) {
348 <            unexpectedException();
349 <        }
350 <        catch (InterruptedException ex) {
351 <            unexpectedException();
352 <        }
197 >    public void testunconfigurableExecutorService() {
198 >        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
199 >        e.execute(new NoOpRunnable());
200 >        e.execute(new NoOpRunnable());
201 >        e.execute(new NoOpRunnable());
202 >        e.shutdown();
203      }
204  
205      /**
206 <     * execute with null executor throws NPE
206 >     * unconfigurableExecutorService(null) throws NPE
207       */
208 <    public void testNullExecuteRunnable() {
208 >    public void testunconfigurableExecutorServiceNPE() {
209          try {
210 <            TrackedShortRunnable task = new TrackedShortRunnable();
361 <            assertFalse(task.done);
362 <            Future<?> future = Executors.execute(null, task);
363 <            shouldThrow();
210 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
211          }
212          catch (NullPointerException success) {
213          }
367        catch (Exception ex) {
368            unexpectedException();
369        }
214      }
215  
216      /**
217 <     * execute with a null runnable throws NPE
217 >     * unconfigurableScheduledExecutorService(null) throws NPE
218       */
219 <    public void testExecuteNullRunnable() {
219 >    public void testunconfigurableScheduledExecutorServiceNPE() {
220          try {
221 <            Executor e = new DirectExecutor();
378 <            TrackedShortRunnable task = null;
379 <            Future<?> future = Executors.execute(e, task);
380 <            shouldThrow();
221 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222          }
223          catch (NullPointerException success) {
224          }
384        catch (Exception ex) {
385            unexpectedException();
386        }
225      }
226  
389    /**
390     * invoke of a null runnable throws NPE
391     */
392    public void testInvokeNullRunnable() {
393        try {
394            Executor e = new DirectExecutor();
395            TrackedShortRunnable task = null;
396            Executors.invoke(e, task);
397            shouldThrow();
398        }
399        catch (NullPointerException success) {
400        }
401        catch (Exception ex) {
402            unexpectedException();
403        }
404    }
227  
228      /**
229 <     * execute of a null callable throws NPE
229 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
230       */
231 <    public void testExecuteNullCallable() {
232 <        try {
233 <            Executor e = new DirectExecutor();
234 <            StringTask t = null;
235 <            Future<String> future = Executors.execute(e, t);
236 <            shouldThrow();
237 <        }
238 <        catch (NullPointerException success) {
239 <        }
240 <        catch (Exception ex) {
231 >    public void testNewSingleThreadScheduledExecutor() {
232 >        try {
233 >            TrackedCallable callable = new TrackedCallable();
234 >            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
235 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
236 >            assertFalse(callable.done);
237 >            Thread.sleep(MEDIUM_DELAY_MS);
238 >            assertTrue(callable.done);
239 >            assertEquals(Boolean.TRUE, f.get());
240 >            p1.shutdown();
241 >            joinPool(p1);
242 >        } catch(RejectedExecutionException e){}
243 >        catch(Exception e){
244 >            e.printStackTrace();
245              unexpectedException();
246          }
247      }
248  
249      /**
250 <     * invoke of a null callable throws NPE
251 <     */
252 <    public void testInvokeNullCallable() {
253 <        try {
254 <            Executor e = new DirectExecutor();
255 <            StringTask t = null;
256 <            String result = Executors.invoke(e, t);
257 <            shouldThrow();
258 <        }
259 <        catch (NullPointerException success) {
260 <        }
261 <        catch (Exception ex) {
250 >     * a newScheduledThreadPool successfully runs delayed task
251 >     */
252 >    public void testnewScheduledThreadPool() {
253 >        try {
254 >            TrackedCallable callable = new TrackedCallable();
255 >            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
256 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
257 >            assertFalse(callable.done);
258 >            Thread.sleep(MEDIUM_DELAY_MS);
259 >            assertTrue(callable.done);
260 >            assertEquals(Boolean.TRUE, f.get());
261 >            p1.shutdown();
262 >            joinPool(p1);
263 >        } catch(RejectedExecutionException e){}
264 >        catch(Exception e){
265 >            e.printStackTrace();
266              unexpectedException();
267          }
268      }
269  
270      /**
271 <     *  execute(Executor, Runnable) throws RejectedExecutionException
272 <     *  if saturated.
273 <     */
274 <    public void testExecute1() {
275 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
276 <        try {
277 <            
278 <            for(int i = 0; i < 5; ++i){
279 <                Executors.execute(p, new MediumRunnable());
280 <            }
281 <            shouldThrow();
282 <        } catch(RejectedExecutionException success){}
283 <        joinPool(p);
284 <    }
285 <
286 <    /**
457 <     *  execute(Executor, Callable)throws RejectedExecutionException
458 <     *  if saturated.
459 <     */
460 <    public void testExecute2() {
461 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
462 <        try {
463 <            for(int i = 0; i < 5; ++i) {
464 <                Executors.execute(p, new SmallCallable());
465 <            }
466 <            shouldThrow();
467 <        } catch(RejectedExecutionException e){}
468 <        joinPool(p);
469 <    }
470 <
471 <
472 <    /**
473 <     *  invoke(Executor, Runnable) throws InterruptedException if
474 <     *  caller interrupted.
475 <     */
476 <    public void testInterruptedInvoke() {
477 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
478 <        Thread t = new Thread(new Runnable() {
479 <                public void run() {
480 <                    try {
481 <                        Executors.invoke(p,new Runnable() {
482 <                                public void run() {
483 <                                    try {
484 <                                        Thread.sleep(MEDIUM_DELAY_MS);
485 <                                        shouldThrow();
486 <                                    } catch(InterruptedException e){
487 <                                    }
488 <                                }
489 <                            });
490 <                    } catch(InterruptedException success){
491 <                    } catch(Exception e) {
492 <                        unexpectedException();
493 <                    }
494 <                    
495 <                }
496 <            });
497 <        try {
498 <            t.start();
499 <            Thread.sleep(SHORT_DELAY_MS);
500 <            t.interrupt();
501 <        } catch(Exception e){
271 >     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
272 >     */
273 >    public void testunconfigurableScheduledExecutorService() {
274 >        try {
275 >            TrackedCallable callable = new TrackedCallable();
276 >            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
277 >            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
278 >            assertFalse(callable.done);
279 >            Thread.sleep(MEDIUM_DELAY_MS);
280 >            assertTrue(callable.done);
281 >            assertEquals(Boolean.TRUE, f.get());
282 >            p1.shutdown();
283 >            joinPool(p1);
284 >        } catch(RejectedExecutionException e){}
285 >        catch(Exception e){
286 >            e.printStackTrace();
287              unexpectedException();
288          }
504        joinPool(p);
289      }
290  
291      /**
508     *  invoke(Executor, Runnable) throws ExecutionException if
509     *  runnable throws exception.
510     */
511    public void testInvoke3() {
512        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
513        try {
514            Runnable r = new Runnable() {
515                    public void run() {
516                        int i = 5/0;
517                    }
518                };
519            
520            for(int i =0; i < 5; i++){
521                Executors.invoke(p,r);
522            }
523            
524            shouldThrow();
525        } catch(ExecutionException success){
526        } catch(Exception e){
527            unexpectedException();
528        }
529        joinPool(p);
530    }
531
532
533
534    /**
535     *  invoke(Executor, Callable) throws InterruptedException if
536     *  callable throws exception
537     */
538    public void testInvoke5() {
539        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
540        
541        final Callable c = new Callable() {
542                public Object call() {
543                    try {
544                        Executors.invoke(p, new SmallCallable());
545                        shouldThrow();
546                    } catch(InterruptedException e){}
547                    catch(RejectedExecutionException e2){}
548                    catch(ExecutionException e3){}
549                    return Boolean.TRUE;
550                }
551            };
552
553
554        
555        Thread t = new Thread(new Runnable() {
556                public void run() {
557                    try {
558                        c.call();
559                    } catch(Exception e){}
560                }
561          });
562        try {
563            t.start();
564            Thread.sleep(SHORT_DELAY_MS);
565            t.interrupt();
566            t.join();
567        } catch(InterruptedException e){
568            unexpectedException();
569        }
570        
571        joinPool(p);
572    }
573
574    /**
575     *  invoke(Executor, Callable) will throw ExecutionException
576     *  if callable throws exception
577     */
578    public void testInvoke6() {
579        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
580
581        try {
582            Callable c = new Callable() {
583                    public Object call() {
584                        int i = 5/0;
585                        return Boolean.TRUE;
586                    }
587                };
588            
589            for(int i =0; i < 5; i++){
590                Executors.invoke(p,c);
591            }
592            
593            shouldThrow();
594        }
595        catch(ExecutionException success){
596        } catch(Exception e) {
597            unexpectedException();
598        }
599        joinPool(p);
600    }
601
602
603
604    /**
292       *  timeouts from execute will time out if they compute too long.
293       */
294      public void testTimedCallable() {
# Line 722 | Line 409 | public class ExecutorsTest extends JSR16
409  
410      }
411  
412 +    static class CheckCCL implements Callable<Object> {
413 +        public Object call() {
414 +            AccessControlContext acc = AccessController.getContext();
415 +            acc.checkPermission(new RuntimePermission("getContextClassLoader"));
416 +            return null;
417 +        }
418 +    }
419 +
420 +
421 +    /**
422 +     * Without class loader permissions, creating
423 +     * privilegedCallableUsingCurrentClassLoader throws ACE
424 +     */
425 +    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
426 +        Policy savedPolicy = Policy.getPolicy();
427 +        AdjustablePolicy policy = new AdjustablePolicy();
428 +        Policy.setPolicy(policy);
429 +        try {
430 +            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
431 +            shouldThrow();
432 +        } catch(AccessControlException success) {
433 +        } catch(Exception ex) {
434 +            unexpectedException();
435 +        }
436 +        finally {
437 +            Policy.setPolicy(savedPolicy);
438 +        }
439 +    }
440 +
441 +    /**
442 +     * Without class loader permissions, calling
443 +     * privilegedCallableUsingCurrentClassLoader throws ACE
444 +     */
445 +    public void testprivilegedCallableUsingCCLWithPrivs() {
446 +        Policy savedPolicy = Policy.getPolicy();
447 +        AdjustablePolicy policy = new AdjustablePolicy();
448 +        policy.addPermission(new RuntimePermission("getContextClassLoader"));
449 +        policy.addPermission(new RuntimePermission("setContextClassLoader"));
450 +        Policy.setPolicy(policy);
451 +        try {
452 +            Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
453 +            task.call();
454 +        } catch(Exception ex) {
455 +            unexpectedException();
456 +        }
457 +        finally {
458 +            Policy.setPolicy(savedPolicy);
459 +        }
460 +    }
461 +
462 +    /**
463 +     * Without permissions, calling privilegedCallable throws ACE
464 +     */
465 +    public void testprivilegedCallableWithNoPrivs() {
466 +        Policy savedPolicy = Policy.getPolicy();
467 +        AdjustablePolicy policy = new AdjustablePolicy();
468 +        Policy.setPolicy(policy);
469 +        Callable task = Executors.privilegedCallable(new CheckCCL());
470 +        Policy.setPolicy(savedPolicy);
471 +        try {
472 +            task.call();
473 +            shouldThrow();
474 +        } catch(AccessControlException success) {
475 +        } catch(Exception ex) {
476 +            unexpectedException();
477 +        } finally {
478 +        }
479 +    }
480 +
481 +    /**
482 +     * With permissions, calling privilegedCallable succeeds
483 +     */
484 +    public void testprivilegedCallableWithPrivs() {
485 +        Policy savedPolicy = Policy.getPolicy();
486 +        AdjustablePolicy policy = new AdjustablePolicy();
487 +        policy.addPermission(new RuntimePermission("getContextClassLoader"));
488 +        policy.addPermission(new RuntimePermission("setContextClassLoader"));
489 +        Policy.setPolicy(policy);
490 +        Callable task = Executors.privilegedCallable(new CheckCCL());
491 +        try {
492 +            task.call();
493 +        } catch(Exception ex) {
494 +            unexpectedException();
495 +        } finally {
496 +            Policy.setPolicy(savedPolicy);
497 +        }
498 +    }
499 +
500 +    /**
501 +     * callable(Runnable) returns null when called
502 +     */
503 +    public void testCallable1() {
504 +        try {
505 +            Callable c = Executors.callable(new NoOpRunnable());
506 +            assertNull(c.call());
507 +        } catch(Exception ex) {
508 +            unexpectedException();
509 +        }
510 +        
511 +    }
512 +
513 +    /**
514 +     * callable(Runnable, result) returns result when called
515 +     */
516 +    public void testCallable2() {
517 +        try {
518 +            Callable c = Executors.callable(new NoOpRunnable(), one);
519 +            assertEquals(one, c.call());
520 +        } catch(Exception ex) {
521 +            unexpectedException();
522 +        }
523 +    }
524 +
525 +    /**
526 +     * callable(PrivilegedAction) returns its result when called
527 +     */
528 +    public void testCallable3() {
529 +        try {
530 +            Callable c = Executors.callable(new PrivilegedAction() {
531 +                    public Object run() { return one; }});
532 +        assertEquals(one, c.call());
533 +        } catch(Exception ex) {
534 +            unexpectedException();
535 +        }
536 +    }
537 +
538 +    /**
539 +     * callable(PrivilegedExceptionAction) returns its result when called
540 +     */
541 +    public void testCallable4() {
542 +        try {
543 +            Callable c = Executors.callable(new PrivilegedExceptionAction() {
544 +                    public Object run() { return one; }});
545 +            assertEquals(one, c.call());
546 +        } catch(Exception ex) {
547 +            unexpectedException();
548 +        }
549 +    }
550 +
551 +
552 +    /**
553 +     * callable(null Runnable) throws NPE
554 +     */
555 +    public void testCallableNPE1() {
556 +        try {
557 +            Runnable r = null;
558 +            Callable c = Executors.callable(r);
559 +        } catch (NullPointerException success) {
560 +        }
561 +    }
562 +
563 +    /**
564 +     * callable(null, result) throws NPE
565 +     */
566 +    public void testCallableNPE2() {
567 +        try {
568 +            Runnable r = null;
569 +            Callable c = Executors.callable(r, one);
570 +        } catch (NullPointerException success) {
571 +        }
572 +    }
573 +
574 +    /**
575 +     * callable(null PrivilegedAction) throws NPE
576 +     */
577 +    public void testCallableNPE3() {
578 +        try {
579 +            PrivilegedAction r = null;
580 +            Callable c = Executors.callable(r);
581 +        } catch (NullPointerException success) {
582 +        }
583 +    }
584 +
585 +    /**
586 +     * callable(null PrivilegedExceptionAction) throws NPE
587 +     */
588 +    public void testCallableNPE4() {
589 +        try {
590 +            PrivilegedExceptionAction r = null;
591 +            Callable c = Executors.callable(r);
592 +        } catch (NullPointerException success) {
593 +        }
594 +    }
595 +
596 +
597   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines